[josm] 01/08: New upstream version 0.0.svn12542+dfsg
Bas Couwenberg
sebastic at debian.org
Sun Jul 30 21:38:57 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit b7a81dfd7c787ba474856c60e9ec591dc57e21c8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Jul 30 22:46:37 2017 +0200
New upstream version 0.0.svn12542+dfsg
---
.classpath | 4 +-
REVISION | 10 +-
build.xml | 21 +-
data/boundaries.osm | 11264 ++++++++++++++++++-
data/defaultpresets.xml | 13 +-
data/validator/combinations.mapcss | 2 +-
data/validator/ignoretags.cfg | 2 +
data/validator/numeric.mapcss | 26 +-
eclipse/JOSM (Java 8).launch | 2 +-
i18n/po/af.po | 233 +-
i18n/po/am.po | 233 +-
i18n/po/ar.po | 233 +-
i18n/po/ast.po | 249 +-
i18n/po/az.po | 233 +-
i18n/po/be.po | 253 +-
i18n/po/bg.po | 247 +-
i18n/po/bn.po | 233 +-
i18n/po/br.po | 233 +-
i18n/po/bs.po | 233 +-
i18n/po/ca.po | 237 +-
i18n/po/ca at valencia.po | 233 +-
i18n/po/cs.po | 278 +-
i18n/po/cy.po | 233 +-
i18n/po/da.po | 393 +-
i18n/po/de.po | 364 +-
i18n/po/de_DE.po | 233 +-
i18n/po/el.po | 233 +-
i18n/po/en_AU.po | 233 +-
i18n/po/en_CA.po | 233 +-
i18n/po/en_GB.po | 241 +-
i18n/po/eo.po | 233 +-
i18n/po/es.po | 270 +-
i18n/po/et.po | 233 +-
i18n/po/eu.po | 233 +-
i18n/po/fa.po | 233 +-
i18n/po/fi.po | 233 +-
i18n/po/fil.po | 233 +-
i18n/po/fo.po | 233 +-
i18n/po/fr.po | 291 +-
i18n/po/ga.po | 233 +-
i18n/po/gl.po | 233 +-
i18n/po/he.po | 233 +-
i18n/po/hi.po | 233 +-
i18n/po/hr.po | 233 +-
i18n/po/ht.po | 233 +-
i18n/po/hu.po | 3105 ++---
i18n/po/hy.po | 233 +-
i18n/po/ia.po | 233 +-
i18n/po/id.po | 233 +-
i18n/po/is.po | 233 +-
i18n/po/it.po | 247 +-
i18n/po/ja.po | 237 +-
i18n/po/ka.po | 233 +-
i18n/po/km.po | 233 +-
i18n/po/ko.po | 233 +-
i18n/po/ku.po | 233 +-
i18n/po/ky.po | 233 +-
i18n/po/lb.po | 233 +-
i18n/po/lo.po | 233 +-
i18n/po/lt.po | 800 +-
i18n/po/lv.po | 233 +-
i18n/po/mk.po | 233 +-
i18n/po/mr.po | 233 +-
i18n/po/ms.po | 233 +-
i18n/po/nb.po | 264 +-
i18n/po/nds.po | 233 +-
i18n/po/nl.po | 253 +-
i18n/po/nn.po | 233 +-
i18n/po/oc.po | 233 +-
i18n/po/pa.po | 233 +-
i18n/po/pl.po | 392 +-
i18n/po/pt.po | 241 +-
i18n/po/pt_BR.po | 243 +-
i18n/po/rm.po | 233 +-
i18n/po/ro.po | 233 +-
i18n/po/ru.po | 296 +-
i18n/po/sk.po | 251 +-
i18n/po/sl.po | 233 +-
i18n/po/sq.po | 233 +-
i18n/po/sr.po | 233 +-
i18n/po/sv.po | 233 +-
i18n/po/ta.po | 233 +-
i18n/po/te.po | 233 +-
i18n/po/th.po | 233 +-
i18n/po/tr.po | 233 +-
i18n/po/ug.po | 233 +-
i18n/po/uk.po | 253 +-
i18n/po/ur.po | 233 +-
i18n/po/vi.po | 237 +-
i18n/po/wae.po | 233 +-
i18n/po/zh_CN.po | 233 +-
i18n/po/zh_TW.po | 249 +-
netbeans/nbproject/project.properties | 6 +-
src/org/openstreetmap/josm/Main.java | 6 +-
.../josm/actions/AddImageryLayerAction.java | 11 +-
.../josm/actions/AlignInLineAction.java | 1 +
.../josm/actions/CombineWayAction.java | 363 +-
.../openstreetmap/josm/actions/DeleteAction.java | 2 +-
.../josm/actions/MapRectifierWMSmenuAction.java | 16 +-
.../josm/actions/OrthogonalizeAction.java | 4 +-
.../josm/actions/PasteTagsAction.java | 4 +-
.../josm/actions/ReverseWayAction.java | 6 +-
.../josm/actions/SessionLoadAction.java | 18 +-
.../josm/actions/SimplifyWayAction.java | 1 +
.../openstreetmap/josm/actions/UnGlueAction.java | 1 -
.../openstreetmap/josm/actions/UploadAction.java | 34 +-
.../josm/actions/mapmode/DeleteAction.java | 32 +-
.../josm/actions/mapmode/DrawAction.java | 12 +-
.../josm/actions/mapmode/ExtrudeAction.java | 22 +-
.../actions/mapmode/ImproveWayAccuracyAction.java | 12 +-
.../josm/actions/mapmode/MapMode.java | 68 +-
.../josm/actions/mapmode/ParallelWayAction.java | 18 +-
.../josm/actions/mapmode/ParallelWays.java | 4 +-
.../josm/actions/mapmode/SelectAction.java | 16 +-
.../josm/actions/search/PushbackTokenizer.java | 6 +-
.../josm/actions/search/SearchAction.java | 176 +-
.../josm/actions/search/SearchCompiler.java | 70 +-
.../josm/corrector/ReverseWayNoTagCorrector.java | 4 +-
.../josm/corrector/ReverseWayTagCorrector.java | 10 +-
src/org/openstreetmap/josm/data/Preferences.java | 16 +-
.../josm/data/cache/ICachedLoaderJob.java | 2 +
.../josm/data/cache/JCSCacheManager.java | 6 +-
.../josm/data/conflict/IConflictListener.java | 12 +
src/org/openstreetmap/josm/data/coor/LatLon.java | 18 +-
src/org/openstreetmap/josm/data/imagery/Shape.java | 4 +-
.../josm/data/imagery/TMSCachedTileLoader.java | 3 +-
.../josm/data/imagery/TemplatedWMSTileSource.java | 16 +-
src/org/openstreetmap/josm/data/notes/Note.java | 30 +-
.../openstreetmap/josm/data/notes/NoteComment.java | 25 +-
.../josm/data/osm/AbstractPrimitive.java | 26 +
src/org/openstreetmap/josm/data/osm/Changeset.java | 21 +-
.../josm/data/osm/ChangesetCache.java | 4 +-
src/org/openstreetmap/josm/data/osm/DataSet.java | 3 +-
src/org/openstreetmap/josm/data/osm/NodeGraph.java | 307 +
src/org/openstreetmap/josm/data/osm/NodePair.java | 109 +
src/org/openstreetmap/josm/data/osm/NoteData.java | 5 +-
.../openstreetmap/josm/data/osm/QuadBuckets.java | 4 +-
src/org/openstreetmap/josm/data/osm/User.java | 4 +-
.../josm/data/osm/event/DatasetEventManager.java | 4 +-
.../josm/data/osm/event/SelectionEventManager.java | 4 +-
.../data/osm/visitor/paint/OffsetIterator.java | 21 +-
.../josm/data/osm/visitor/paint/PaintColors.java | 4 +-
.../data/osm/visitor/paint/StyledMapRenderer.java | 37 +-
.../data/preferences/ParametrizedEnumProperty.java | 5 +
.../data/projection/ProjectionChangeListener.java | 3 +
.../ProjectionConfigurationException.java | 7 +
.../josm/data/projection/datum/AbstractDatum.java | 5 +
.../data/validation/routines/DomainValidator.java | 3 +-
.../josm/data/validation/tests/InternetTags.java | 4 +-
.../josm/data/validation/tests/Lanes.java | 1 +
src/org/openstreetmap/josm/gui/MapFrame.java | 5 +-
src/org/openstreetmap/josm/gui/MapSlider.java | 6 +-
src/org/openstreetmap/josm/gui/MapViewState.java | 8 +
src/org/openstreetmap/josm/gui/NoteSortDialog.java | 5 +-
.../josm/gui/autofilter/AutoFilter.java | 5 +
.../josm/gui/autofilter/AutoFilterButton.java | 2 +-
.../josm/gui/autofilter/AutoFilterManager.java | 36 +-
.../josm/gui/bbox/SlippyMapControler.java | 4 +-
.../gui/datatransfer/importers/TextTagPaster.java | 4 +-
.../josm/gui/dialogs/ConflictDialog.java | 93 +-
.../josm/gui/dialogs/RelationListDialog.java | 4 +-
.../dialogs/changeset/ChangesetCacheManager.java | 28 +-
.../changeset/ChangesetCacheManagerModel.java | 2 +-
.../changeset/ChangesetCacheTableCellRenderer.java | 4 +-
.../dialogs/changeset/ChangesetDetailPanel.java | 3 +-
.../changeset/ChangesetListCellRenderer.java | 4 +-
.../gui/dialogs/properties/PropertiesDialog.java | 2 +-
.../josm/gui/dialogs/properties/TagEditHelper.java | 4 +-
.../relation/MemberTableLinkedCellRenderer.java | 32 +-
.../gui/dialogs/relation/sort/RelationSorter.java | 14 +-
.../josm/gui/download/BookmarkList.java | 197 +-
.../josm/gui/download/BookmarkSelection.java | 21 +
.../josm/gui/download/DownloadDialog.java | 2 +-
.../openstreetmap/josm/gui/draw/MapViewPath.java | 66 +-
.../openstreetmap/josm/gui/help/HelpBrowser.java | 6 +-
.../josm/gui/history/VersionTableModel.java | 23 +-
.../josm/gui/io/AbstractUploadTask.java | 5 +
.../josm/gui/io/ChangesetCellRenderer.java | 8 +-
.../io/ConfigurationParameterRequestHandler.java | 11 +
.../josm/gui/io/CredentialDialog.java | 6 +
.../josm/gui/io/LayerNameAndFilePathTableCell.java | 12 +-
.../josm/gui/io/SaveLayersDialog.java | 6 +
.../openstreetmap/josm/gui/io/SaveLayersModel.java | 3 +
.../openstreetmap/josm/gui/io/SaveLayersTable.java | 3 +
.../josm/gui/io/SaveLayersTableColumnModel.java | 13 +-
.../josm/gui/io/UploadAndSaveProgressRenderer.java | 3 +
.../openstreetmap/josm/gui/io/UploadDialog.java | 21 +-
.../josm/gui/io/UploadParameterSummaryPanel.java | 3 +-
.../josm/gui/layer/AbstractTileSourceLayer.java | 8 +-
.../josm/gui/layer/CustomizeColor.java | 6 +
.../openstreetmap/josm/gui/layer/ImageryLayer.java | 5 +
.../josm/gui/layer/JumpToMarkerActions.java | 24 +
.../josm/gui/layer/geoimage/ImageDisplay.java | 5 +
.../josm/gui/layer/geoimage/ImageViewerDialog.java | 3 +
.../josm/gui/layer/geoimage/ThumbsLoader.java | 5 +
.../gui/layer/imagery/SharpenImageProcessor.java | 6 +-
.../gui/mappaint/mapcss/ExpressionFactory.java | 21 +-
.../josm/gui/mappaint/mapcss/Selector.java | 47 +-
.../gui/mappaint/styleelement/BoxTextElement.java | 24 +-
.../gui/mappaint/styleelement/StyleElement.java | 16 +-
.../gui/mappaint/styleelement/TextElement.java | 43 +-
.../josm/gui/mappaint/styleelement/TextLabel.java | 118 +-
.../placement/CompletelyInsideAreaStrategy.java | 56 +-
.../styleelement/placement/OnLineStrategy.java | 43 +-
.../placement/PartiallyInsideAreaStrategy.java | 20 +-
.../placement/PositionForAreaStrategy.java | 9 +
.../gui/preferences/DefaultPreferenceSetting.java | 16 +
.../preferences/DefaultTabPreferenceSetting.java | 5 +
.../josm/gui/preferences/PreferenceDialog.java | 7 +
.../josm/gui/preferences/PreferenceTabbedPane.java | 54 +-
.../josm/gui/preferences/SourceProvider.java | 9 +
.../gui/preferences/imagery/AddImageryDialog.java | 4 +-
.../gui/preferences/imagery/AddImageryPanel.java | 1 +
.../projection/LambertProjectionChoice.java | 4 +-
.../projection/ProjectionPreference.java | 30 +-
.../projection/UTMFranceDOMProjectionChoice.java | 40 +-
.../josm/gui/preferences/shortcut/PrefJPanel.java | 11 +-
.../openstreetmap/josm/gui/tagging/TagTable.java | 2 +-
.../josm/gui/util/AdvancedKeyPressDetector.java | 40 +
.../josm/gui/util/FileFilterAllFiles.java | 8 +-
.../josm/gui/util/ModifierExListener.java | 15 +
.../josm/gui/util/ModifierListener.java | 2 +
src/org/openstreetmap/josm/io/ChangesetQuery.java | 26 +
.../josm/io/DefaultProxySelector.java | 8 +-
.../openstreetmap/josm/io/DiffResultProcessor.java | 9 +
src/org/openstreetmap/josm/io/FileExporter.java | 18 +
src/org/openstreetmap/josm/io/GeoJSONWriter.java | 4 +-
.../josm/io/MissingOAuthAccessTokenException.java | 9 +-
.../openstreetmap/josm/io/OsmChangeImporter.java | 4 +
.../openstreetmap/josm/io/OsmChangesetParser.java | 2 +-
src/org/openstreetmap/josm/io/OsmConnection.java | 2 +-
src/org/openstreetmap/josm/io/OsmImporter.java | 4 +
.../josm/io/OsmServerReadPostprocessor.java | 11 +-
src/org/openstreetmap/josm/io/OsmServerReader.java | 63 +
.../josm/io/OsmServerUserInfoReader.java | 28 +-
.../josm/io/OsmServerUserPreferencesReader.java | 94 +
.../josm/io/OsmServerWritePostprocessor.java | 5 +
.../josm/io/StreamProgressUpdater.java | 4 +
src/org/openstreetmap/josm/io/XmlWriter.java | 20 +-
.../josm/io/audio/JavaFxMediaPlayer.java | 12 +-
.../openstreetmap/josm/io/imagery/WMSImagery.java | 36 +-
.../josm/io/remotecontrol/AddTagsDialog.java | 2 +-
.../josm/io/remotecontrol/DNSNameFix.java | 105 -
.../io/remotecontrol/RemoteControlHttpsServer.java | 23 +-
.../remotecontrol/handler/LoadAndZoomHandler.java | 10 +-
.../remotecontrol/handler/LoadObjectHandler.java | 10 +-
.../josm/io/session/SessionReader.java | 186 +-
.../josm/io/session/SessionWriter.java | 60 +-
src/org/openstreetmap/josm/tools/ColorScale.java | 8 +-
src/org/openstreetmap/josm/tools/I18n.java | 4 +-
.../openstreetmap/josm/tools/ImageProvider.java | 6 +-
.../openstreetmap/josm/tools/InputMapUtils.java | 8 +-
.../josm/tools/MultikeyActionsHandler.java | 3 +-
.../openstreetmap/josm/tools/PlatformHookOsx.java | 4 +-
src/org/openstreetmap/josm/tools/Shortcut.java | 15 +-
src/org/openstreetmap/josm/tools/Territories.java | 5 +-
test/data/renderer/area-text/reference.png | Bin 4820 -> 4889 bytes
test/data/renderer/area-text/style.mapcss | 9 +
test/data/renderer/way-dashes-clamp/data.osm | 165 +
test/data/renderer/way-dashes-clamp/reference.png | Bin 0 -> 6015 bytes
test/data/renderer/way-dashes-clamp/style.mapcss | 20 +
test/data/renderer/way-dashes/data.osm | 135 +-
test/data/renderer/way-dashes/reference.png | Bin 5945 -> 4889 bytes
test/data/renderer/way-repeat-image-clamp/data.osm | 165 +
.../renderer/way-repeat-image-clamp/reference.png | Bin 0 -> 43650 bytes
.../renderer/way-repeat-image-clamp/style.mapcss | 22 +
.../data/renderer/way-repeat-image-clamp/trees.svg | 378 +
test/data/renderer/way-text/data.osm | 97 +
test/data/renderer/way-text/reference.png | Bin 0 -> 21086 bytes
test/data/renderer/way-text/style.mapcss | 49 +
.../josm/gui/mappaint/MapCSSRendererTest.java | 9 +-
.../josm/actions/CombineWayActionTest.java | 4 +-
.../josm/actions/mapmode/DrawActionTest.java | 4 +-
.../josm/actions/mapmode/SelectActionTest.java | 12 +-
.../josm/actions/search/SearchCompilerTest.java | 198 +
.../openstreetmap/josm/data/osm/DataSetTest.java | 36 +
.../openstreetmap/josm/data/osm/NodeGraphTest.java | 79 +
.../preferences/map/MapPaintPreferenceTestIT.java | 7 +-
.../josm/io/remotecontrol/DNSNameFixTest.java | 33 -
tools/pmd/josm-ruleset.xml | 50 +-
280 files changed, 35981 insertions(+), 4298 deletions(-)
diff --git a/.classpath b/.classpath
index c1a3f36..bedc33b 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="org/apache/commons/compress/compressors/CompressorException.java|org/apache/commons/compress/compressors/CompressorStreamFactory.java|org/apache/commons/compress/compressors/FileNameUtil.java|org/apache/commons/compress/compressors/bzip2/BZip2Utils.java|org/apache/commons/compress/compressors/deflate/|org/apache/commons/compress/compressors/gzip/|org/apache/commons/compress/compressors/lzma/|org/apache/commons/compress/compressors/lzw/|org/apache/commons/compr [...]
+ <classpathentry excluding="org/apache/commons/compress/compressors/CompressorException.java|org/apache/commons/compress/compressors/CompressorStreamFactory.java|org/apache/commons/compress/compressors/CompressorStreamProvider.java|org/apache/commons/compress/compressors/FileNameUtil.java|org/apache/commons/compress/compressors/brotli/|org/apache/commons/compress/compressors/bzip2/BZip2Utils.java|org/apache/commons/compress/compressors/deflate/|org/apache/commons/compress/compressors/gzi [...]
<classpathentry including="data/|images/|resources/|styles/" kind="src" path=""/>
<classpathentry kind="src" path="test/unit"/>
<classpathentry kind="src" path="test/functional"/>
@@ -14,7 +14,7 @@
<classpathentry kind="lib" path="test/lib/fest/jcip-annotations-1.0.jar"/>
<classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar"/>
<classpathentry kind="lib" path="test/lib/jfcunit.jar"/>
- <classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.3.1.jar"/>
<classpathentry kind="lib" path="test/lib/reflections/reflections-0.9.10.jar"/>
<classpathentry kind="lib" path="test/lib/reflections/guava-21.0.jar"/>
<classpathentry kind="lib" path="test/lib/reflections/javassist-3.21.0-GA.jar"/>
diff --git a/REVISION b/REVISION
index 2badc3c..5168a9a 100644
--- a/REVISION
+++ b/REVISION
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<info>
<entry
+ kind="dir"
path="trunk"
- revision="12450"
- kind="dir">
+ revision="12542">
<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="12450">
-<author>bastiK</author>
-<date>2017-07-02T22:44:07.233914Z</date>
+ revision="12542">
+<author>Don-vip</author>
+<date>2017-07-30T15:07:42.868633Z</date>
</commit>
</entry>
</info>
diff --git a/build.xml b/build.xml
index 2918f7f..48b78cb 100644
--- a/build.xml
+++ b/build.xml
@@ -143,8 +143,8 @@ Build-Date: ${build.tstamp}
<attribute name="Codebase" value="josm.openstreetmap.de"/>
<attribute name="Application-Name" value="JOSM - Java OpenStreetMap Editor"/>
<!-- Java 9 stuff. Entries are safely ignored by Java 8 -->
- <attribute name="Add-Exports" value="java.base/sun.security.util 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/jdk.internal.loader java.base/sun.security.x509 java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
+ <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/jdk.internal.loader java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
</manifest>
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
@@ -231,6 +231,9 @@ Build-Date: ${build.tstamp}
destdir="build" target="1.8" source="1.8" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
<!-- get rid of "internal proprietary API" warning -->
<compilerarg value="-XDignore.symbol.file"/>
+ <exclude name="org/apache/commons/compress/PasswordRequiredException.java"/>
+ <exclude name="org/apache/commons/compress/archivers/**"/>
+ <exclude name="org/apache/commons/compress/changes/**"/>
<exclude name="org/apache/commons/compress/compressors/bzip2/BZip2Utils.java"/>
<exclude name="org/apache/commons/compress/compressors/brotli/**"/>
<exclude name="org/apache/commons/compress/compressors/lzma/**"/>
@@ -243,10 +246,10 @@ Build-Date: ${build.tstamp}
<exclude name="org/apache/commons/compress/compressors/gzip/**"/>
<exclude name="org/apache/commons/compress/compressors/lz4/**"/>
<exclude name="org/apache/commons/compress/compressors/lz77support/**"/>
- <exclude name="org/apache/commons/compress/compressors/lzw/**"/>
<exclude name="org/apache/commons/compress/compressors/pack200/**"/>
<exclude name="org/apache/commons/compress/compressors/snappy/**"/>
<exclude name="org/apache/commons/compress/compressors/z/**"/>
+ <exclude name="org/apache/commons/compress/parallel/**"/>
<exclude name="org/apache/commons/compress/utils/ArchiveUtils.java"/>
<exclude name="org/apache/commons/jcs/JCS.java"/>
<exclude name="org/apache/commons/jcs/access/GroupCacheAccess.java"/>
@@ -444,7 +447,7 @@ Build-Date: ${build.tstamp}
<jvmarg value="java.se.ee" if:set="isJava9" />
<jvmarg value="--add-exports" if:set="isJava9" />
<jvmarg value="java.base/sun.security.util=ALL-UNNAMED" if:set="isJava9" />
- <jvmarg value="--add-opens" if:set="isJava9" />
+ <jvmarg value="--add-exports" if:set="isJava9" />
<jvmarg value="java.base/sun.security.x509=ALL-UNNAMED" if:set="isJava9" />
<jvmarg value="--add-exports" if:set="isJava9" />
<jvmarg value="javafx.graphics/com.sun.javafx.application=ALL-UNNAMED" if:set="isJava9" />
@@ -483,18 +486,20 @@ Build-Date: ${build.tstamp}
</sequential>
</macrodef>
<target name="test" depends="test-compile" unless="test.notRequired"
- description="Run unit, functional and performance tests. OSM API (TEST) account shall be set with -Dosm.username and -Dosm.password">
+ description="Run unit and functional tests. OSM API (TEST) account shall be set with -Dosm.username and -Dosm.password">
<call-junit testfamily="unit"/>
<call-junit testfamily="functional"/>
- <call-junit testfamily="performance" coverage="false"/>
</target>
<target name="test-it" depends="test-compile" unless="test-it.notRequired"
description="Run integration tests. OSM API (TEST) account shall be set with -Dosm.username and -Dosm.password">
<call-junit testfamily="unit" testITsuffix="IT"/>
<call-junit testfamily="functional" testITsuffix="IT"/>
- <call-junit testfamily="performance" testITsuffix="IT" coverage="false"/>
</target>
- <target name="test-html" depends="test, test-it" description="Generate HTML test reports">
+ <target name="test-perf" depends="test-compile" unless="test-perf.notRequired"
+ description="Run performance tests. OSM API (TEST) account shall be set with -Dosm.username and -Dosm.password">
+ <call-junit testfamily="performance" coverage="false"/>
+ </target>
+ <target name="test-html" depends="test, test-it, test-perf" description="Generate HTML test reports">
<!-- May require additional ant dependencies like ant-trax package -->
<junitreport todir="${test.dir}/report">
<fileset dir="${test.dir}/report">
diff --git a/data/boundaries.osm b/data/boundaries.osm
index 83de9d3..a16ca76 100644
--- a/data/boundaries.osm
+++ b/data/boundaries.osm
@@ -859,9 +859,7 @@
<node id='-1720' lat='26.79613' lon='85.73483' />
<node id='-1722' lat='26.67471' lon='85.72315' />
<node id='-1724' lat='26.45892' lon='86.76797' />
- <node id='-1726' lat='26.50468' lon='86.90214' />
<node id='-1728' lat='26.43919' lon='86.82898' />
- <node id='-1730' lat='26.47125' lon='86.88813' />
<node id='-1732' lat='26.58685' lon='87.04691' />
<node id='-1734' lat='26.53228' lon='87.01559' />
<node id='-1736' lat='26.52076' lon='86.95912' />
@@ -901,11 +899,9 @@
<node id='-1804' lat='27.94835' lon='87.03757' />
<node id='-1806' lat='27.80938' lon='87.72718' />
<node id='-1808' lat='27.95248' lon='87.82681' />
- <node id='-1810' lat='28.10912' lon='86.68421' />
- <node id='-1812' lat='28.07067' lon='86.62505' />
<node id='-1814' lat='28.04182' lon='86.75582' />
<node id='-1816' lat='28.10638' lon='86.74181' />
- <node id='-1818' lat='28.11599' lon='86.56746' />
+ <node id='-1818' lat='28.09569' lon='86.56265' />
<node id='-1820' lat='27.96623' lon='86.51609' />
<node id='-1822' lat='27.91122' lon='86.42736' />
<node id='-1824' lat='27.9786' lon='86.22966' />
@@ -4641,7 +4637,6 @@
<node id='-9286' lat='27.29818' lon='96.40779' />
<node id='-9288' lat='26.65372' lon='95.30339' />
<node id='-9290' lat='26.07338' lon='95.18556' />
- <node id='-9292' lat='25.93214' lon='95.02858' />
<node id='-9294' lat='24.56656' lon='94.45279' />
<node id='-9296' lat='23.83333' lon='94.14081' />
<node id='-9298' lat='24.0003' lon='93.75952' />
@@ -4667,10 +4662,8 @@
<node id='-9338' lat='27.18109' lon='69.58519' />
<node id='-9340' lat='27.56627' lon='70.03136' />
<node id='-9342' lat='27.8057' lon='70.12502' />
- <node id='-9344' lat='27.71829' lon='70.75626' />
<node id='-9346' lat='27.96035' lon='71.89921' />
<node id='-9348' lat='28.11555' lon='71.9244' />
- <node id='-9350' lat='28.22326' lon='72.0033' />
<node id='-9352' lat='28.3869' lon='72.20329' />
<node id='-9354' lat='28.66367' lon='72.29495' />
<node id='-9356' lat='28.78283' lon='72.40402' />
@@ -5429,7 +5422,7 @@
<node id='-10864' lat='37.62643' lon='125.37112' />
<node id='-10866' lat='37.66334' lon='125.06408' />
<node id='-10868' lat='37.977' lon='124.84224' />
- <node id='-10870' lat='39.61248' lon='124.09174' />
+ <node id='-10870' lat='38.79949' lon='123.90497' />
<node id='-10872' lat='-22.09157' lon='-57.98625' />
<node id='-10874' lat='-22.29008' lon='-55.8331' />
<node id='-10876' lat='-23.9657' lon='-55.41784' />
@@ -5959,13 +5952,13 @@
<node id='-11924' lat='32.33183' lon='127.42045' />
<node id='-11926' lat='34.87122' lon='129.2669' />
<node id='-11928' lat='37.41' lon='133.61399' />
- <node id='-11930' lat='33.39749' lon='123.59627' />
- <node id='-11932' lat='38.08134' lon='123.96588' />
+ <node id='-11930' lat='33.30571' lon='122.80525' />
+ <node id='-11932' lat='37.49093' lon='123.85601' />
<node id='-11934' lat='37.81462' lon='126.19097' />
<node id='-11936' lat='37.72949' lon='125.81159' />
<node id='-11938' lat='38.05679' lon='124.67666' />
<node id='-11940' lat='37.80827' lon='124.87921' />
- <node id='-11942' lat='30.65625' lon='123.38925' />
+ <node id='-11942' lat='31.01942' lon='123.54580' />
<node id='-11944' lat='25.22863' lon='120.49232' />
<node id='-11946' lat='24.33015' lon='118.179' />
<node id='-11948' lat='24.54644' lon='118.42453' />
@@ -5989,7 +5982,7 @@
<node id='-11984' lat='3.86466' lon='99.75778' />
<node id='-11986' lat='5.70549' lon='97.65314' />
<node id='-11988' lat='6.60903' lon='94.98735' />
- <node id='-11990' lat='5.96666' lon='94.19973' />
+ <node id='-11990' lat='5.95573' lon='93.82619' />
<node id='-11992' lat='-7.16134' lon='96.82918' />
<node id='-11994' lat='-11.65621' lon='122.91521' />
<node id='-11996' lat='-8.97063' lon='139.41724' />
@@ -10715,9 +10708,7 @@
<node id='-21462' lat='31.31561' lon='67.04147' />
<node id='-21464' lat='31.26867' lon='66.83273' />
<node id='-21466' lat='37.21565' lon='74.80605' />
- <node id='-21468' lat='37.14453' lon='74.45449' />
<node id='-21470' lat='37.24518' lon='74.49981' />
- <node id='-21472' lat='36.01754' lon='76.00356' />
<node id='-21474' lat='35.82848' lon='76.14913' />
<node id='-21476' lat='35.9264' lon='76.15325' />
<node id='-21478' lat='35.8908' lon='76.50961' />
@@ -10725,11 +10716,8 @@
<node id='-21482' lat='36.56986' lon='75.92391' />
<node id='-21484' lat='36.41198' lon='76.0324' />
<node id='-21486' lat='36.17511' lon='76.00906' />
- <node id='-21488' lat='36.34896' lon='75.98296' />
<node id='-21490' lat='36.95382' lon='75.40481' />
<node id='-21492' lat='36.71971' lon='75.45562' />
- <node id='-21494' lat='36.77803' lon='75.54214' />
- <node id='-21496' lat='36.72412' lon='75.52291' />
<node id='-21498' lat='37.02622' lon='75.13839' />
<node id='-21500' lat='38.84782' lon='73.7033' />
<node id='-21502' lat='38.93867' lon='73.7445' />
@@ -10984,7 +10972,6 @@
<node id='-22000' lat='23.94432' lon='93.50616' />
<node id='-22002' lat='23.92549' lon='93.80279' />
<node id='-22004' lat='23.95812' lon='93.92089' />
- <node id='-22006' lat='23.88531' lon='94.08981' />
<node id='-22008' lat='24.23752' lon='94.30215' />
<node id='-22010' lat='25.20318' lon='94.57458' />
<node id='-22012' lat='25.13606' lon='94.74212' />
@@ -10992,12 +10979,8 @@
<node id='-22016' lat='24.70764' lon='94.5526' />
<node id='-22018' lat='24.70889' lon='94.60204' />
<node id='-22020' lat='25.00545' lon='94.73937' />
- <node id='-22022' lat='24.86349' lon='94.6556' />
<node id='-22024' lat='25.47003' lon='94.68032' />
<node id='-22026' lat='25.49359' lon='94.80117' />
- <node id='-22028' lat='25.74248' lon='95.04287' />
- <node id='-22030' lat='25.7264' lon='94.99343' />
- <node id='-22032' lat='25.96494' lon='95.09643' />
<node id='-22034' lat='26.1019' lon='95.11428' />
<node id='-22036' lat='26.38397' lon='95.12801' />
<node id='-22038' lat='26.45408' lon='95.05798' />
@@ -11058,24 +11041,15 @@
<node id='-22148' lat='35.67356' lon='76.84539' />
<node id='-22150' lat='35.5932' lon='76.96624' />
<node id='-22152' lat='35.46132' lon='77.44277' />
- <node id='-22154' lat='35.52505' lon='77.19283' />
- <node id='-22156' lat='35.60102' lon='77.04314' />
- <node id='-22158' lat='35.48704' lon='77.49496' />
<node id='-22160' lat='35.46244' lon='77.70232' />
- <node id='-22162' lat='35.47698' lon='77.91518' />
<node id='-22164' lat='35.52058' lon='77.80532' />
<node id='-22166' lat='35.23954' lon='78.00033' />
<node id='-22168' lat='35.3785' lon='78.03466' />
- <node id='-22170' lat='35.10146' lon='78.1253' />
<node id='-22172' lat='34.88771' lon='78.22692' />
- <node id='-22174' lat='34.71857' lon='78.20632' />
- <node id='-22176' lat='34.8201' lon='78.22555' />
<node id='-22178' lat='34.7998' lon='78.18435' />
- <node id='-22180' lat='34.70502' lon='78.27087' />
<node id='-22182' lat='34.08858' lon='78.66225' />
<node id='-22184' lat='34.15452' lon='78.91769' />
- <node id='-22186' lat='34.30894' lon='78.97811' />
- <node id='-22188' lat='34.29532' lon='79.05502' />
+ <node id='-22186' lat='34.30270' lon='78.99802' />
<node id='-22190' lat='34.32482' lon='79.05364' />
<node id='-22192' lat='34.45174' lon='78.74465' />
<node id='-22194' lat='34.57283' lon='78.54964' />
@@ -11110,7 +11084,7 @@
<node id='-22252' lat='24.26021' lon='68.97781' />
<node id='-22254' lat='24.29777' lon='69.07806' />
<node id='-22256' lat='24.25646' lon='69.19341' />
- <node id='-22258' lat='24.30027' lon='69.30053' />
+ <node id='-22258' lat='24.28712' lon='69.29778' />
<node id='-22260' lat='24.29777' lon='69.59579' />
<node id='-22262' lat='24.43787' lon='70.5667' />
<node id='-22264' lat='24.27774' lon='70.57906' />
@@ -11135,10 +11109,8 @@
<node id='-22302' lat='26.24118' lon='70.17532' />
<node id='-22304' lat='26.55362' lon='70.17532' />
<node id='-22306' lat='28.01208' lon='70.37307' />
- <node id='-22308' lat='27.92718' lon='70.6697' />
- <node id='-22310' lat='27.87863' lon='71.66396' />
- <node id='-22312' lat='27.70369' lon='70.88668' />
- <node id='-22314' lat='27.86164' lon='71.28219' />
+ <node id='-22308' lat='28.02178' lon='70.60927' />
+ <node id='-22312' lat='27.68423' lon='70.79054' />
<node id='-22316' lat='30.28466' lon='73.95736' />
<node id='-22318' lat='31.13829' lon='74.51629' />
<node id='-22320' lat='31.12771' lon='74.6852' />
@@ -13688,7 +13660,6 @@
<node id='-27410' lat='24.27692' lon='94.32362' />
<node id='-27412' lat='23.36139' lon='93.38781' />
<node id='-27414' lat='21.05697' lon='92.26071' />
- <node id='-27416' lat='22.99974' lon='91.73122' />
<node id='-27418' lat='25.22686' lon='90.1155' />
<node id='-27420' lat='25.31038' lon='89.90478' />
<node id='-27422' lat='25.28337' lon='89.87629' />
@@ -14679,6 +14650,3039 @@
<node id='-83513' lat='48.29972' lon='39.95248' />
<node id='-83537' lat='48.29904' lon='39.9693' />
<node id='-83564' lat='48.31399' lon='39.97325' />
+ <node id='-85088' lat='34.41540' lon='79.05418' />
+ <node id='-85090' lat='34.48958' lon='79.83283' />
+ <node id='-85098' lat='35.45172' lon='80.45287' />
+ <node id='-85100' lat='35.24337' lon='81.66961' />
+ <node id='-85102' lat='35.34201' lon='82.01568' />
+ <node id='-85104' lat='35.73090' lon='82.45238' />
+ <node id='-85106' lat='35.62716' lon='82.96600' />
+ <node id='-85108' lat='35.39688' lon='83.12530' />
+ <node id='-85110' lat='35.35881' lon='84.19784' />
+ <node id='-85112' lat='35.80333' lon='85.26489' />
+ <node id='-85114' lat='35.64055' lon='85.57662' />
+ <node id='-85116' lat='35.86790' lon='86.09298' />
+ <node id='-85118' lat='36.19995' lon='86.26190' />
+ <node id='-85120' lat='36.48755' lon='88.53332' />
+ <node id='-85122' lat='36.29077' lon='88.76438' />
+ <node id='-85124' lat='36.35716' lon='88.94119' />
+ <node id='-85126' lat='36.09350' lon='89.69100' />
+ <node id='-85130' lat='36.01522' lon='89.40811' />
+ <node id='-85132' lat='35.91602' lon='89.42802' />
+ <node id='-85136' lat='35.85900' lon='89.80224' />
+ <node id='-85146' lat='35.42207' lon='89.68482' />
+ <node id='-85150' lat='35.22991' lon='89.45274' />
+ <node id='-85154' lat='34.90113' lon='89.57908' />
+ <node id='-85156' lat='34.90395' lon='89.81941' />
+ <node id='-85160' lat='34.65862' lon='89.73358' />
+ <node id='-85166' lat='34.22770' lon='89.87708' />
+ <node id='-85168' lat='34.04583' lon='89.63882' />
+ <node id='-85172' lat='33.80083' lon='89.93751' />
+ <node id='-85174' lat='33.55913' lon='89.99656' />
+ <node id='-85182' lat='33.42857' lon='90.24993' />
+ <node id='-85184' lat='33.26050' lon='90.38177' />
+ <node id='-85186' lat='33.26510' lon='90.51567' />
+ <node id='-85188' lat='33.13985' lon='90.70175' />
+ <node id='-85196' lat='33.11339' lon='91.51405' />
+ <node id='-85200' lat='32.86113' lon='91.97891' />
+ <node id='-85204' lat='32.88766' lon='92.20275' />
+ <node id='-85206' lat='32.72144' lon='92.22335' />
+ <node id='-85208' lat='32.73646' lon='93.02398' />
+ <node id='-85214' lat='32.49470' lon='93.48953' />
+ <node id='-85216' lat='32.57343' lon='93.72161' />
+ <node id='-85218' lat='32.43561' lon='94.14733' />
+ <node id='-85220' lat='32.67001' lon='94.61254' />
+ <node id='-85222' lat='32.41300' lon='94.91981' />
+ <node id='-85224' lat='32.38720' lon='95.22571' />
+ <node id='-85242' lat='31.74685' lon='95.51032' />
+ <node id='-85244' lat='31.77896' lon='95.61881' />
+ <node id='-85246' lat='31.75327' lon='95.78910' />
+ <node id='-85248' lat='31.69078' lon='96.14822' />
+ <node id='-85250' lat='31.53816' lon='96.20109' />
+ <node id='-85252' lat='31.55396' lon='96.25053' />
+ <node id='-85254' lat='31.76145' lon='96.21963' />
+ <node id='-85256' lat='31.82623' lon='96.13929' />
+ <node id='-85258' lat='31.93410' lon='96.24435' />
+ <node id='-85260' lat='31.95682' lon='96.33636' />
+ <node id='-85262' lat='31.85539' lon='96.37069' />
+ <node id='-85264' lat='31.71940' lon='96.56570' />
+ <node id='-85266' lat='31.70830' lon='96.84310' />
+ <node id='-85268' lat='32.02612' lon='96.72500' />
+ <node id='-85270' lat='31.99351' lon='96.95640' />
+ <node id='-85272' lat='32.06628' lon='97.00309' />
+ <node id='-85274' lat='32.03049' lon='97.16583' />
+ <node id='-85276' lat='32.10962' lon='97.22557' />
+ <node id='-85278' lat='32.07501' lon='97.30865' />
+ <node id='-85284' lat='32.53060' lon='97.37663' />
+ <node id='-85286' lat='32.47704' lon='97.66399' />
+ <node id='-85288' lat='32.52886' lon='97.72544' />
+ <node id='-85290' lat='32.46748' lon='97.99255' />
+ <node id='-85292' lat='32.33936' lon='98.21639' />
+ <node id='-85294' lat='32.12619' lon='98.30497' />
+ <node id='-85298' lat='32.00458' lon='98.43475' />
+ <node id='-85302' lat='31.83089' lon='98.40900' />
+ <node id='-85304' lat='31.67705' lon='98.56246' />
+ <node id='-85308' lat='31.50626' lon='98.71971' />
+ <node id='-85310' lat='31.42954' lon='98.84433' />
+ <node id='-85314' lat='31.37767' lon='98.88896' />
+ <node id='-85318' lat='31.24949' lon='98.77567' />
+ <node id='-85320' lat='31.33751' lon='98.69052' />
+ <node id='-85322' lat='31.33839' lon='98.63559' />
+ <node id='-85326' lat='31.18725' lon='98.60469' />
+ <node id='-85328' lat='31.11997' lon='98.71009' />
+ <node id='-85330' lat='31.03293' lon='98.75404' />
+ <node id='-85334' lat='30.98496' lon='98.80725' />
+ <node id='-85336' lat='30.92431' lon='98.78528' />
+ <node id='-85342' lat='30.74862' lon='98.95523' />
+ <node id='-85344' lat='30.68457' lon='98.90613' />
+ <node id='-85350' lat='30.15344' lon='98.99642' />
+ <node id='-85352' lat='30.07979' lon='99.04380' />
+ <node id='-85354' lat='29.93708' lon='99.05651' />
+ <node id='-85356' lat='29.81890' lon='99.01119' />
+ <node id='-85358' lat='29.66359' lon='98.98956' />
+ <node id='-85364' lat='29.45051' lon='99.06234' />
+ <node id='-85368' lat='29.30586' lon='99.05479' />
+ <node id='-85370' lat='29.22679' lon='99.11487' />
+ <node id='-85372' lat='29.18663' lon='98.96003' />
+ <node id='-85374' lat='29.03425' lon='99.01840' />
+ <node id='-85376' lat='28.98111' lon='98.92501' />
+ <node id='-85378' lat='28.88796' lon='98.91815' />
+ <node id='-85380' lat='28.87564' lon='98.97376' />
+ <node id='-85382' lat='28.82933' lon='98.97548' />
+ <node id='-85384' lat='28.80406' lon='98.83197' />
+ <node id='-85386' lat='29.01054' lon='98.78974' />
+ <node id='-85388' lat='28.97210' lon='98.62495' />
+ <node id='-85390' lat='28.85850' lon='98.65447' />
+ <node id='-85392' lat='28.79549' lon='98.66254' />
+ <node id='-85394' lat='28.73319' lon='98.68125' />
+ <node id='-85396' lat='28.69103' lon='98.63113' />
+ <node id='-85398' lat='28.68622' lon='98.59680' />
+ <node id='-85400' lat='28.49072' lon='98.63697' />
+ <node id='-85402' lat='28.33218' lon='98.75884' />
+ <node id='-85404' lat='28.21789' lon='98.69361' />
+ <node id='-85406' lat='28.17250' lon='98.60881' />
+ <node id='-85408' lat='28.10953' lon='98.39355' />
+ <node id='-85410' lat='28.26084' lon='98.36952' />
+ <node id='-85412' lat='28.39804' lon='98.28987' />
+ <node id='-85414' lat='28.35666' lon='98.20129' />
+ <node id='-85416' lat='28.24421' lon='98.26789' />
+ <node id='-85418' lat='28.21002' lon='98.16696' />
+ <node id='-85624' lat='36.08018' lon='89.95056' />
+ <node id='-85626' lat='36.26310' lon='90.01922' />
+ <node id='-85628' lat='36.02577' lon='90.86379' />
+ <node id='-85630' lat='36.10792' lon='91.10961' />
+ <node id='-85632' lat='36.54053' lon='91.02035' />
+ <node id='-85634' lat='36.59347' lon='90.71960' />
+ <node id='-85636' lat='36.93342' lon='90.84869' />
+ <node id='-85638' lat='37.02887' lon='91.31149' />
+ <node id='-85640' lat='37.48575' lon='91.06567' />
+ <node id='-85642' lat='37.74465' lon='90.51360' />
+ <node id='-85644' lat='38.31903' lon='90.52322' />
+ <node id='-85646' lat='38.22955' lon='90.31585' />
+ <node id='-85648' lat='38.33734' lon='90.14076' />
+ <node id='-85650' lat='38.39764' lon='90.18127' />
+ <node id='-85652' lat='38.49014' lon='90.09406' />
+ <node id='-85654' lat='38.49928' lon='90.44975' />
+ <node id='-85656' lat='39.03625' lon='92.40874' />
+ <node id='-85658' lat='40.58058' lon='92.92785' />
+ <node id='-85660' lat='40.66605' lon='93.76556' />
+ <node id='-85662' lat='41.53428' lon='94.80789' />
+ <node id='-85664' lat='41.74980' lon='95.19103' />
+ <node id='-85666' lat='41.54559' lon='95.35171' />
+ <node id='-85668' lat='41.97225' lon='96.18324' />
+ <node id='-85670' lat='42.38796' lon='96.04934' />
+ <node id='-86237' lat='53.03956' lon='121.82738' />
+ <node id='-86239' lat='52.57468' lon='121.20391' />
+ <node id='-86241' lat='52.27152' lon='121.87133' />
+ <node id='-86243' lat='52.50786' lon='122.19817' />
+ <node id='-86245' lat='52.20255' lon='122.73650' />
+ <node id='-86247' lat='51.31173' lon='122.96447' />
+ <node id='-86249' lat='51.30400' lon='124.27871' />
+ <node id='-86251' lat='51.62824' lon='125.31005' />
+ <node id='-86253' lat='50.96621' lon='126.06674' />
+ <node id='-86255' lat='50.74080' lon='125.78521' />
+ <node id='-86257' lat='50.53263' lon='125.78933' />
+ <node id='-86259' lat='50.39626' lon='125.51467' />
+ <node id='-86261' lat='49.93442' lon='125.18989' />
+ <node id='-86263' lat='49.32691' lon='125.25649' />
+ <node id='-86265' lat='49.23777' lon='125.21530' />
+ <node id='-86267' lat='49.12377' lon='125.10681' />
+ <node id='-86269' lat='49.17945' lon='124.86099' />
+ <node id='-86271' lat='48.83037' lon='124.67834' />
+ <node id='-86273' lat='48.74894' lon='124.61036' />
+ <node id='-86275' lat='48.46928' lon='124.53552' />
+ <node id='-86277' lat='48.12485' lon='124.50118' />
+ <node id='-86279' lat='48.52933' lon='124.26086' />
+ <node id='-86281' lat='48.03493' lon='123.55361' />
+ <node id='-86283' lat='47.67648' lon='122.84637' />
+ <node id='-86285' lat='47.34626' lon='122.39730' />
+ <node id='-86287' lat='47.08041' lon='122.69393' />
+ <node id='-86289' lat='46.72385' lon='123.00842' />
+ <node id='-86291' lat='46.96291' lon='123.46778' />
+ <node id='-86293' lat='46.69042' lon='123.59275' />
+ <node id='-86295' lat='46.56877' lon='123.00498' />
+ <node id='-86297' lat='46.22830' lon='123.17046' />
+ <node id='-86299' lat='45.94064' lon='122.79418' />
+ <node id='-86301' lat='45.70474' lon='122.72003' />
+ <node id='-86303' lat='45.77710' lon='122.52433' />
+ <node id='-86305' lat='45.91390' lon='122.39868' />
+ <node id='-86307' lat='45.79434' lon='122.25860' />
+ <node id='-86309' lat='46.04083' lon='121.87270' />
+ <node id='-86311' lat='45.99505' lon='121.75735' />
+ <node id='-86313' lat='45.87280' lon='121.82121' />
+ <node id='-86315' lat='45.73877' lon='121.64337' />
+ <node id='-86317' lat='45.68267' lon='121.74568' />
+ <node id='-86319' lat='45.71097' lon='121.95098' />
+ <node id='-86321' lat='45.63660' lon='121.99836' />
+ <node id='-86323' lat='45.48324' lon='122.01965' />
+ <node id='-86325' lat='45.41484' lon='122.16522' />
+ <node id='-86327' lat='45.29710' lon='122.14530' />
+ <node id='-86329' lat='44.91327' lon='122.08213' />
+ <node id='-86331' lat='44.57237' lon='122.11715' />
+ <node id='-86333' lat='44.22256' lon='122.33001' />
+ <node id='-86335' lat='44.52294' lon='123.14300' />
+ <node id='-86337' lat='44.34938' lon='123.13270' />
+ <node id='-86339' lat='44.15215' lon='123.37715' />
+ <node id='-86341' lat='44.06045' lon='123.32290' />
+ <node id='-86343' lat='43.64203' lon='123.53301' />
+ <node id='-86345' lat='43.48979' lon='123.32153' />
+ <node id='-86347' lat='43.37560' lon='123.68682' />
+ <node id='-86349' lat='42.99862' lon='123.55224' />
+ <node id='-86351' lat='42.98255' lon='123.24737' />
+ <node id='-86353' lat='42.73087' lon='122.80517' />
+ <node id='-86355' lat='42.86590' lon='122.41241' />
+ <node id='-86357' lat='42.67032' lon='121.92077' />
+ <node id='-86359' lat='42.53588' lon='121.86309' />
+ <node id='-86361' lat='42.43967' lon='121.66534' />
+ <node id='-86363' lat='42.51968' lon='121.56646' />
+ <node id='-86365' lat='42.43359' lon='121.28494' />
+ <node id='-86367' lat='42.27019' lon='121.03774' />
+ <node id='-86369' lat='42.16747' lon='120.57220' />
+ <node id='-86371' lat='41.98297' lon='120.40878' />
+ <node id='-86373' lat='41.84245' lon='120.18424' />
+ <node id='-86375' lat='41.68932' lon='120.09498' />
+ <node id='-86377' lat='41.71341' lon='120.02975' />
+ <node id='-86379' lat='41.81277' lon='120.03662' />
+ <node id='-86381' lat='42.21428' lon='119.83474' />
+ <node id='-86383' lat='42.29356' lon='119.54498' />
+ <node id='-86385' lat='42.39709' lon='119.50584' />
+ <node id='-86387' lat='42.25901' lon='119.27032' />
+ <node id='-86389' lat='42.19596' lon='119.23736' />
+ <node id='-86391' lat='42.12522' lon='119.29916' />
+ <node id='-86393' lat='42.08803' lon='119.37950' />
+ <node id='-86395' lat='41.78155' lon='119.28268' />
+ <node id='-86397' lat='41.62519' lon='119.32456' />
+ <node id='-86399' lat='41.58566' lon='119.39392' />
+ <node id='-86401' lat='41.43191' lon='119.36576' />
+ <node id='-86403' lat='41.32732' lon='119.29435' />
+ <node id='-86405' lat='41.29638' lon='119.14810' />
+ <node id='-86407' lat='41.35980' lon='118.79585' />
+ <node id='-86409' lat='41.31082' lon='118.38729' />
+ <node id='-86411' lat='41.62314' lon='118.20396' />
+ <node id='-86413' lat='41.76567' lon='118.11538' />
+ <node id='-86415' lat='41.85728' lon='118.34335' />
+ <node id='-86417' lat='42.08446' lon='118.26232' />
+ <node id='-86419' lat='42.02838' lon='118.18267' />
+ <node id='-86421' lat='42.25952' lon='117.98973' />
+ <node id='-86423' lat='42.39962' lon='118.01376' />
+ <node id='-86425' lat='42.61678' lon='117.78510' />
+ <node id='-86427' lat='42.59151' lon='117.44453' />
+ <node id='-86429' lat='42.46449' lon='117.39921' />
+ <node id='-86431' lat='42.45994' lon='117.00782' />
+ <node id='-86433' lat='42.37985' lon='116.88697' />
+ <node id='-86435' lat='42.18477' lon='116.90757' />
+ <node id='-86437' lat='42.19902' lon='116.78054' />
+ <node id='-86439' lat='42.00236' lon='116.86981' />
+ <node id='-86441' lat='41.93037' lon='116.70158' />
+ <node id='-86443' lat='41.99675' lon='116.30058' />
+ <node id='-86445' lat='41.84399' lon='116.10763' />
+ <node id='-86447' lat='41.77131' lon='116.06574' />
+ <node id='-86449' lat='41.93804' lon='115.91194' />
+ <node id='-86451' lat='41.93191' lon='115.81787' />
+ <node id='-86453' lat='41.67291' lon='115.31112' />
+ <node id='-86455' lat='41.59541' lon='115.33927' />
+ <node id='-86457' lat='41.59593' lon='114.85450' />
+ <node id='-86459' lat='41.85882' lon='114.93484' />
+ <node id='-86461' lat='42.14456' lon='114.84626' />
+ <node id='-86463' lat='42.11095' lon='114.50637' />
+ <node id='-86465' lat='41.94570' lon='114.43702' />
+ <node id='-86467' lat='41.69547' lon='114.23309' />
+ <node id='-86469' lat='41.50703' lon='114.21455' />
+ <node id='-86471' lat='41.52503' lon='114.01336' />
+ <node id='-86473' lat='41.41338' lon='113.85612' />
+ <node id='-86475' lat='41.19054' lon='113.99208' />
+ <node id='-86477' lat='41.08452' lon='113.83621' />
+ <node id='-86479' lat='40.85485' lon='114.06829' />
+ <node id='-86481' lat='40.79795' lon='114.05834' />
+ <node id='-86483' lat='40.74569' lon='114.12460' />
+ <node id='-86485' lat='40.67634' lon='114.06520' />
+ <node id='-86487' lat='40.54093' lon='114.07001' />
+ <node id='-86489' lat='40.50544' lon='113.93783' />
+ <node id='-86491' lat='40.44511' lon='113.85234' />
+ <node id='-86493' lat='40.44250' lon='113.67210' />
+ <node id='-86495' lat='40.33450' lon='113.53443' />
+ <node id='-86497' lat='40.31304' lon='113.31504' />
+ <node id='-86499' lat='40.41349' lon='113.24809' />
+ <node id='-86501' lat='40.32822' lon='112.88761' />
+ <node id='-86503' lat='40.20169' lon='112.84572' />
+ <node id='-86505' lat='40.16260' lon='112.73963' />
+ <node id='-86507' lat='40.23891' lon='112.61947' />
+ <node id='-86509' lat='40.29995' lon='112.45399' />
+ <node id='-86511' lat='40.25463' lon='112.30293' />
+ <node id='-86513' lat='39.97527' lon='112.10758' />
+ <node id='-86515' lat='39.78822' lon='111.97059' />
+ <node id='-86517' lat='39.61468' lon='111.91909' />
+ <node id='-86519' lat='39.59537' lon='111.72615' />
+ <node id='-86521' lat='39.62525' lon='111.67121' />
+ <node id='-86523' lat='39.65698' lon='111.53217' />
+ <node id='-86525' lat='39.64006' lon='111.43295' />
+ <node id='-86527' lat='39.50245' lon='111.41990' />
+ <node id='-86529' lat='39.47489' lon='111.36188' />
+ <node id='-86531' lat='39.42081' lon='111.33235' />
+ <node id='-86533' lat='39.42638' lon='111.21288' />
+ <node id='-86535' lat='39.40250' lon='111.12945' />
+ <node id='-86537' lat='39.36403' lon='111.11881' />
+ <node id='-86539' lat='39.35859' lon='111.09289' />
+ <node id='-86541' lat='39.43022' lon='111.04808' />
+ <node id='-86547' lat='39.58478' lon='111.15074' />
+ <node id='-86555' lat='39.50854' lon='110.88363' />
+ <node id='-86559' lat='39.26522' lon='110.68759' />
+ <node id='-86561' lat='39.27744' lon='110.59661' />
+ <node id='-86563' lat='39.38340' lon='110.52005' />
+ <node id='-86567' lat='39.38261' lon='110.43662' />
+ <node id='-86569' lat='39.30826' lon='110.38135' />
+ <node id='-86573' lat='39.45660' lon='110.23063' />
+ <node id='-86577' lat='39.42876' lon='110.10944' />
+ <node id='-86581' lat='39.28488' lon='110.20866' />
+ <node id='-86603' lat='39.14683' lon='109.89795' />
+ <node id='-86605' lat='39.05011' lon='109.70809' />
+ <node id='-86607' lat='38.80119' lon='109.55428' />
+ <node id='-86609' lat='38.35673' lon='108.96240' />
+ <node id='-86611' lat='38.17883' lon='108.93356' />
+ <node id='-86613' lat='38.03592' lon='109.18521' />
+ <node id='-86615' lat='38.01618' lon='109.02831' />
+ <node id='-86617' lat='37.91820' lon='108.93836' />
+ <node id='-86619' lat='38.06620' lon='108.83193' />
+ <node id='-86621' lat='37.68436' lon='108.78936' />
+ <node id='-86627' lat='37.66561' lon='108.01174' />
+ <node id='-86629' lat='37.79269' lon='107.96607' />
+ <node id='-86635' lat='38.16155' lon='107.16270' />
+ <node id='-86641' lat='38.31903' lon='106.47743' />
+ <node id='-86647' lat='38.94819' lon='106.95396' />
+ <node id='-86653' lat='39.37518' lon='106.78161' />
+ <node id='-86655' lat='39.36934' lon='106.59484' />
+ <node id='-86663' lat='39.15615' lon='106.13479' />
+ <node id='-86665' lat='38.62116' lon='105.85121' />
+ <node id='-86667' lat='38.34219' lon='105.82580' />
+ <node id='-86669' lat='37.94149' lon='105.80039' />
+ <node id='-86671' lat='37.79513' lon='105.76606' />
+ <node id='-86673' lat='37.63707' lon='105.10619' />
+ <node id='-86675' lat='37.54240' lon='104.99084' />
+ <node id='-86677' lat='37.43670' lon='104.29321' />
+ <node id='-86679' lat='37.65773' lon='103.83865' />
+ <node id='-86681' lat='37.88352' lon='103.39507' />
+ <node id='-86683' lat='38.08809' lon='103.36074' />
+ <node id='-86685' lat='38.15615' lon='103.54476' />
+ <node id='-86687' lat='39.12047' lon='104.18884' />
+ <node id='-86689' lat='39.46482' lon='103.93890' />
+ <node id='-86691' lat='39.10981' lon='102.96798' />
+ <node id='-86693' lat='39.23757' lon='102.45712' />
+ <node id='-86695' lat='39.06931' lon='101.88720' />
+ <node id='-86697' lat='38.64154' lon='101.72790' />
+ <node id='-86699' lat='39.18224' lon='100.84075' />
+ <node id='-86701' lat='39.98659' lon='99.70229' />
+ <node id='-86703' lat='40.67439' lon='100.28045' />
+ <node id='-86705' lat='40.97575' lon='99.76958' />
+ <node id='-86707' lat='40.56806' lon='98.31390' />
+ <node id='-86867' lat='32.55781' lon='97.66296' />
+ <node id='-86873' lat='32.62332' lon='97.54417' />
+ <node id='-86875' lat='32.64241' lon='97.53250' />
+ <node id='-86877' lat='32.65556' lon='97.48168' />
+ <node id='-86879' lat='32.71220' lon='97.42710' />
+ <node id='-86881' lat='32.80718' lon='97.37766' />
+ <node id='-86883' lat='32.86978' lon='97.37834' />
+ <node id='-86885' lat='32.90380' lon='97.33989' />
+ <node id='-86887' lat='32.98130' lon='97.43190' />
+ <node id='-86889' lat='32.99167' lon='97.53078' />
+ <node id='-86891' lat='33.11512' lon='97.49061' />
+ <node id='-86893' lat='33.16600' lon='97.48580' />
+ <node id='-86895' lat='33.25964' lon='97.59841' />
+ <node id='-86897' lat='33.33769' lon='97.62348' />
+ <node id='-86899' lat='33.40536' lon='97.75840' />
+ <node id='-86903' lat='33.63062' lon='97.40409' />
+ <node id='-86905' lat='33.89492' lon='97.39517' />
+ <node id='-86907' lat='33.93538' lon='97.65266' />
+ <node id='-86909' lat='34.12431' lon='97.66158' />
+ <node id='-86913' lat='34.09816' lon='98.41689' />
+ <node id='-86915' lat='33.85217' lon='98.42651' />
+ <node id='-86917' lat='33.43717' lon='98.73962' />
+ <node id='-86919' lat='33.14675' lon='98.85497' />
+ <node id='-86921' lat='32.90092' lon='99.36035' />
+ <node id='-86923' lat='32.72375' lon='99.73388' />
+ <node id='-86925' lat='33.04781' lon='99.88220' />
+ <node id='-86929' lat='32.65671' lon='100.49554' />
+ <node id='-86931' lat='32.57140' lon='100.54687' />
+ <node id='-86933' lat='32.52481' lon='100.66463' />
+ <node id='-86935' lat='32.67492' lon='100.71819' />
+ <node id='-86937' lat='32.60756' lon='100.94032' />
+ <node id='-86939' lat='32.63619' lon='101.11850' />
+ <node id='-86941' lat='32.76071' lon='101.22665' />
+ <node id='-86943' lat='33.22835' lon='101.16210' />
+ <node id='-86947' lat='33.09844' lon='101.64001' />
+ <node id='-86949' lat='33.46925' lon='101.76223' />
+ <node id='-86951' lat='33.51506' lon='101.61254' />
+ <node id='-86953' lat='33.67349' lon='101.58782' />
+ <node id='-86959' lat='33.65463' lon='101.17034' />
+ <node id='-86961' lat='33.79455' lon='101.19232' />
+ <node id='-86965' lat='34.17545' lon='100.76110' />
+ <node id='-86969' lat='34.37404' lon='100.94581' />
+ <node id='-86973' lat='34.06233' lon='101.76841' />
+ <node id='-86977' lat='34.36441' lon='102.25318' />
+ <node id='-86979' lat='34.51221' lon='102.15499' />
+ <node id='-86981' lat='34.70436' lon='101.72996' />
+ <node id='-86985' lat='35.18503' lon='102.40218' />
+ <node id='-86987' lat='35.34369' lon='102.31910' />
+ <node id='-86991' lat='35.58808' lon='102.50381' />
+ <node id='-86993' lat='35.49533' lon='102.75169' />
+ <node id='-86995' lat='35.57580' lon='102.80456' />
+ <node id='-86997' lat='35.86011' lon='102.70568' />
+ <node id='-87001' lat='35.83507' lon='102.94670' />
+ <node id='-87007' lat='36.03299' lon='102.97004' />
+ <node id='-87011' lat='36.25562' lon='103.02394' />
+ <node id='-87013' lat='36.30073' lon='102.92026' />
+ <node id='-87015' lat='36.33338' lon='102.88936' />
+ <node id='-87017' lat='36.33531' lon='102.83168' />
+ <node id='-87019' lat='36.37098' lon='102.82859' />
+ <node id='-87021' lat='36.60009' lon='102.71598' />
+ <node id='-87023' lat='36.71081' lon='102.59651' />
+ <node id='-87025' lat='36.76886' lon='102.72319' />
+ <node id='-87033' lat='36.97238' lon='102.47325' />
+ <node id='-87037' lat='37.10447' lon='102.64594' />
+ <node id='-87043' lat='37.73108' lon='101.98780' />
+ <node id='-87051' lat='37.79160' lon='101.35780' />
+ <node id='-87055' lat='38.01293' lon='100.97019' />
+ <node id='-87059' lat='38.16749' lon='100.93105' />
+ <node id='-87069' lat='38.45735' lon='100.09815' />
+ <node id='-87071' lat='38.21120' lon='100.17677' />
+ <node id='-87077' lat='39.08743' lon='98.74923' />
+ <node id='-87079' lat='39.03358' lon='98.28643' />
+ <node id='-87081' lat='38.88515' lon='98.24867' />
+ <node id='-87083' lat='38.78513' lon='98.08937' />
+ <node id='-87085' lat='39.16733' lon='97.33680' />
+ <node id='-87087' lat='39.20884' lon='96.97769' />
+ <node id='-87171' lat='38.91080' lon='96.93580' />
+ <node id='-87175' lat='38.62840' lon='97.05459' />
+ <node id='-87179' lat='38.48665' lon='96.66595' />
+ <node id='-87185' lat='38.22901' lon='96.65702' />
+ <node id='-87187' lat='38.15669' lon='96.29859' />
+ <node id='-87189' lat='38.36857' lon='95.65658' />
+ <node id='-87191' lat='38.30502' lon='95.24459' />
+ <node id='-87193' lat='38.43638' lon='94.99053' />
+ <node id='-87195' lat='38.35781' lon='94.53460' />
+ <node id='-87197' lat='38.76265' lon='94.35607' />
+ <node id='-87199' lat='38.90920' lon='93.42086' />
+ <node id='-87201' lat='39.17372' lon='93.11599' />
+ <node id='-87344' lat='23.31766' lon='105.59509' />
+ <node id='-87346' lat='23.53314' lon='105.87730' />
+ <node id='-87348' lat='23.45190' lon='106.00089' />
+ <node id='-87350' lat='23.57720' lon='106.14097' />
+ <node id='-87352' lat='23.90592' lon='106.15608' />
+ <node id='-87354' lat='24.12858' lon='106.00364' />
+ <node id='-87356' lat='24.03831' lon='105.64796' />
+ <node id='-87358' lat='24.13798' lon='105.57174' />
+ <node id='-87360' lat='24.01949' lon='105.49552' />
+ <node id='-87362' lat='24.14988' lon='105.16868' />
+ <node id='-87364' lat='24.34209' lon='105.19615' />
+ <node id='-87366' lat='24.43839' lon='105.02380' />
+ <node id='-87368' lat='24.43777' lon='104.71481' />
+ <node id='-87370' lat='24.31018' lon='104.70588' />
+ <node id='-87372' lat='24.44527' lon='104.56718' />
+ <node id='-87374' lat='24.65044' lon='104.46590' />
+ <node id='-87376' lat='24.73498' lon='104.52804' />
+ <node id='-87378' lat='24.62017' lon='104.73884' />
+ <node id='-87380' lat='24.79982' lon='105.02792' />
+ <node id='-87382' lat='24.94186' lon='105.10345' />
+ <node id='-87384' lat='24.99850' lon='105.21606' />
+ <node id='-87386' lat='24.91135' lon='105.45020' />
+ <node id='-87388' lat='24.80917' lon='105.49621' />
+ <node id='-87390' lat='24.70254' lon='105.80520' />
+ <node id='-87392' lat='24.72936' lon='105.93875' />
+ <node id='-87394' lat='24.63079' lon='106.01600' />
+ <node id='-87396' lat='24.78954' lon='106.18560' />
+ <node id='-87398' lat='24.87491' lon='106.19522' />
+ <node id='-87400' lat='24.95618' lon='106.13994' />
+ <node id='-87402' lat='25.02121' lon='106.43726' />
+ <node id='-87404' lat='25.13533' lon='106.63913' />
+ <node id='-87406' lat='25.16734' lon='106.63621' />
+ <node id='-87408' lat='25.18148' lon='106.69595' />
+ <node id='-87410' lat='25.18723' lon='106.89216' />
+ <node id='-87412' lat='25.25214' lon='106.91757' />
+ <node id='-87414' lat='25.24500' lon='106.99722' />
+ <node id='-87416' lat='25.44203' lon='106.96083' />
+ <node id='-87418' lat='25.56226' lon='107.07206' />
+ <node id='-87420' lat='25.57682' lon='107.23171' />
+ <node id='-87422' lat='25.39428' lon='107.35153' />
+ <node id='-87424' lat='25.28909' lon='107.43118' />
+ <node id='-87426' lat='25.30414' lon='107.48233' />
+ <node id='-87428' lat='25.21736' lon='107.46568' />
+ <node id='-87430' lat='25.26410' lon='107.60610' />
+ <node id='-87432' lat='25.32106' lon='107.64970' />
+ <node id='-87434' lat='25.19282' lon='107.69313' />
+ <node id='-87436' lat='25.24314' lon='107.75218' />
+ <node id='-87438' lat='25.11979' lon='107.77622' />
+ <node id='-87440' lat='25.21363' lon='108.11096' />
+ <node id='-87442' lat='25.45319' lon='108.18923' />
+ <node id='-87444' lat='25.53500' lon='108.34648' />
+ <node id='-87446' lat='25.30306' lon='108.61976' />
+ <node id='-87448' lat='25.49348' lon='108.60671' />
+ <node id='-87450' lat='25.64709' lon='108.73237' />
+ <node id='-87452' lat='25.53067' lon='108.80721' />
+ <node id='-87454' lat='25.53376' lon='109.07501' />
+ <node id='-87456' lat='25.72877' lon='109.06745' />
+ <node id='-87458' lat='25.68299' lon='108.88275' />
+ <node id='-87460' lat='25.79865' lon='109.03312' />
+ <node id='-87462' lat='25.76650' lon='109.19929' />
+ <node id='-87464' lat='25.71702' lon='109.26521' />
+ <node id='-87466' lat='26.03334' lon='109.47669' />
+ <node id='-87468' lat='26.00001' lon='109.72663' />
+ <node id='-87470' lat='25.88517' lon='109.68749' />
+ <node id='-87472' lat='25.88023' lon='109.82276' />
+ <node id='-87474' lat='26.04259' lon='109.81109' />
+ <node id='-87476' lat='26.19241' lon='109.97486' />
+ <node id='-87478' lat='26.01914' lon='110.09811' />
+ <node id='-87480' lat='25.96915' lon='110.31028' />
+ <node id='-87482' lat='26.33465' lon='110.61172' />
+ <node id='-87484' lat='26.25277' lon='110.75317' />
+ <node id='-87486' lat='26.26694' lon='110.92620' />
+ <node id='-87488' lat='26.38510' lon='110.96328' />
+ <node id='-87490' lat='26.31188' lon='111.09306' />
+ <node id='-87492' lat='26.24662' lon='111.29287' />
+ <node id='-87494' lat='25.94693' lon='111.19125' />
+ <node id='-87496' lat='25.85922' lon='111.25579' />
+ <node id='-87498' lat='25.88208' lon='111.48239' />
+ <node id='-87500' lat='25.73001' lon='111.37596' />
+ <node id='-87502' lat='25.70155' lon='111.30042' />
+ <node id='-87504' lat='25.47613' lon='111.31347' />
+ <node id='-87506' lat='25.10922' lon='110.97015' />
+ <node id='-87508' lat='24.91570' lon='110.98525' />
+ <node id='-87510' lat='25.14528' lon='111.28326' />
+ <node id='-87512' lat='25.02526' lon='111.46179' />
+ <node id='-87514' lat='24.68320' lon='111.42745' />
+ <node id='-87516' lat='24.63952' lon='111.52633' />
+ <node id='-87518' lat='24.78486' lon='111.68666' />
+ <node id='-87520' lat='24.77987' lon='112.04166' />
+ <node id='-87707' lat='24.69506' lon='111.93145' />
+ <node id='-87709' lat='24.35522' lon='112.05711' />
+ <node id='-87711' lat='24.10978' lon='111.87171' />
+ <node id='-87713' lat='23.97339' lon='111.92596' />
+ <node id='-87715' lat='23.81330' lon='111.79515' />
+ <node id='-87717' lat='23.83308' lon='111.65645' />
+ <node id='-87719' lat='23.64641' lon='111.63276' />
+ <node id='-87721' lat='23.62313' lon='111.47724' />
+ <node id='-87727' lat='23.19654' lon='111.34094' />
+ <node id='-87731' lat='23.03013' lon='111.42711' />
+ <node id='-87733' lat='22.96123' lon='111.35158' />
+ <node id='-87845' lat='22.85086' lon='111.31965' />
+ <node id='-87847' lat='22.63682' lon='110.99452' />
+ <node id='-87849' lat='22.56931' lon='110.74424' />
+ <node id='-87851' lat='22.46307' lon='110.73738' />
+ <node id='-87853' lat='22.47576' lon='110.67626' />
+ <node id='-87855' lat='22.27353' lon='110.78475' />
+ <node id='-87857' lat='22.23349' lon='110.64193' />
+ <node id='-87859' lat='22.17659' lon='110.67317' />
+ <node id='-87861' lat='22.15274' lon='110.62442' />
+ <node id='-87863' lat='22.19567' lon='110.34702' />
+ <node id='-87865' lat='21.93476' lon='110.36556' />
+ <node id='-87867' lat='21.91199' lon='110.39234' />
+ <node id='-87869' lat='21.89096' lon='110.38410' />
+ <node id='-87871' lat='21.89351' lon='110.32127' />
+ <node id='-87873' lat='21.91756' lon='110.28573' />
+ <node id='-87875' lat='21.88332' lon='110.24642' />
+ <node id='-87877' lat='21.90148' lon='110.19458' />
+ <node id='-87883' lat='21.87185' lon='109.98481' />
+ <node id='-87885' lat='21.84397' lon='109.94585' />
+ <node id='-87887' lat='21.71198' lon='109.92216' />
+ <node id='-87889' lat='21.65008' lon='109.89040' />
+ <node id='-87891' lat='21.67178' lon='109.76371' />
+ <node id='-87893' lat='21.60540' lon='109.73968' />
+ <node id='-87895' lat='21.47351' lon='109.78912' />
+ <node id='-88316' lat='24.89889' lon='104.60151' />
+ <node id='-88318' lat='25.00348' lon='104.71206' />
+ <node id='-88320' lat='25.19096' lon='104.72545' />
+ <node id='-88322' lat='25.17200' lon='104.83119' />
+ <node id='-88324' lat='25.28195' lon='104.78622' />
+ <node id='-88326' lat='25.27450' lon='104.66022' />
+ <node id='-88328' lat='25.52695' lon='104.52152' />
+ <node id='-88330' lat='25.47861' lon='104.44633' />
+ <node id='-88332' lat='25.65947' lon='104.30900' />
+ <node id='-88334' lat='26.02007' lon='104.47002' />
+ <node id='-88336' lat='26.31926' lon='104.59258' />
+ <node id='-88338' lat='26.36910' lon='104.68666' />
+ <node id='-88340' lat='26.59405' lon='104.56031' />
+ <node id='-88342' lat='26.58422' lon='104.47963' />
+ <node id='-88344' lat='26.73028' lon='104.40925' />
+ <node id='-88346' lat='26.62444' lon='104.34162' />
+ <node id='-88348' lat='26.67323' lon='104.15279' />
+ <node id='-88350' lat='26.51389' lon='104.00104' />
+ <node id='-88352' lat='26.53417' lon='103.81530' />
+ <node id='-88354' lat='26.83173' lon='103.70510' />
+ <node id='-88356' lat='26.94900' lon='103.78063' />
+ <node id='-88358' lat='27.06248' lon='103.68621' />
+ <node id='-88360' lat='27.00591' lon='103.61377' />
+ <node id='-88362' lat='27.11872' lon='103.62716' />
+ <node id='-88364' lat='27.27202' lon='103.83865' />
+ <node id='-88366' lat='27.45375' lon='103.94165' />
+ <node id='-88368' lat='27.27080' lon='104.18334' />
+ <node id='-88370' lat='27.47233' lon='104.37217' />
+ <node id='-88372' lat='27.40712' lon='104.50984' />
+ <node id='-88374' lat='27.30528' lon='104.60460' />
+ <node id='-88376' lat='27.34523' lon='104.85145' />
+ <node id='-88378' lat='27.28362' lon='104.86312' />
+ <node id='-88380' lat='27.42114' lon='105.08079' />
+ <node id='-88382' lat='27.37603' lon='105.21057' />
+ <node id='-88384' lat='27.71088' lon='105.31219' />
+ <node id='-88386' lat='27.90584' lon='105.23254' />
+ <node id='-88388' lat='28.07258' lon='105.17074' />
+ <node id='-88390' lat='28.09742' lon='105.03616' />
+ <node id='-88392' lat='27.90766' lon='104.87205' />
+ <node id='-88394' lat='27.85000' lon='104.56409' />
+ <node id='-88396' lat='28.05834' lon='104.28909' />
+ <node id='-88398' lat='28.11801' lon='104.44805' />
+ <node id='-88402' lat='28.34366' lon='104.35432' />
+ <node id='-88406' lat='28.30679' lon='104.30076' />
+ <node id='-88408' lat='28.54532' lon='104.23725' />
+ <node id='-88410' lat='28.61556' lon='104.46659' />
+ <node id='-88412' lat='28.65293' lon='104.36977' />
+ <node id='-88414' lat='28.61014' lon='104.08241' />
+ <node id='-88416' lat='28.62672' lon='103.89015' />
+ <node id='-88418' lat='28.68004' lon='103.85616' />
+ <node id='-88422' lat='28.51757' lon='103.78749' />
+ <node id='-88424' lat='28.38807' lon='103.85959' />
+ <node id='-88426' lat='28.30256' lon='103.87367' />
+ <node id='-88428' lat='28.23453' lon='103.76552' />
+ <node id='-88430' lat='28.19974' lon='103.70304' />
+ <node id='-88432' lat='28.26719' lon='103.63574' />
+ <node id='-88434' lat='28.04077' lon='103.40434' />
+ <node id='-88438' lat='27.97135' lon='103.57601' />
+ <node id='-88442' lat='27.39676' lon='103.09295' />
+ <node id='-88444' lat='27.41078' lon='102.93777' />
+ <node id='-88446' lat='27.25585' lon='102.88352' />
+ <node id='-88448' lat='27.13248' lon='102.91992' />
+ <node id='-88450' lat='26.90308' lon='102.90412' />
+ <node id='-88454' lat='26.53079' lon='103.05725' />
+ <node id='-88456' lat='26.34019' lon='102.95700' />
+ <node id='-88458' lat='26.29095' lon='102.38708' />
+ <node id='-88460' lat='26.07652' lon='102.10075' />
+ <node id='-88462' lat='26.05061' lon='101.81167' />
+ <node id='-88464' lat='26.16653' lon='101.79725' />
+ <node id='-88468' lat='26.60571' lon='101.37908' />
+ <node id='-88470' lat='26.60387' lon='101.46629' />
+ <node id='-88472' lat='26.88778' lon='101.37428' />
+ <node id='-88474' lat='27.03160' lon='101.15867' />
+ <node id='-88476' lat='27.83907' lon='100.71166' />
+ <node id='-88478' lat='27.72608' lon='100.33607' />
+ <node id='-88480' lat='28.21063' lon='100.00785' />
+ <node id='-88482' lat='28.56582' lon='99.96116' />
+ <node id='-88484' lat='28.82362' lon='99.66384' />
+ <node id='-88486' lat='28.51033' lon='99.38713' />
+ <node id='-88488' lat='28.16463' lon='99.39742' />
+ <node id='-88490' lat='28.43488' lon='99.15504' />
+ <node id='-89332' lat='33.58773' lon='101.94625' />
+ <node id='-89334' lat='33.10937' lon='101.81579' />
+ <node id='-89336' lat='33.47211' lon='102.46879' />
+ <node id='-89338' lat='33.98379' lon='102.14332' />
+ <node id='-89340' lat='33.97753' lon='102.39120' />
+ <node id='-89342' lat='34.09929' lon='102.45849' />
+ <node id='-89344' lat='34.07541' lon='102.66792' />
+ <node id='-89346' lat='34.33266' lon='102.89039' />
+ <node id='-89348' lat='34.07484' lon='103.17672' />
+ <node id='-89350' lat='33.79740' lon='103.16162' />
+ <node id='-89352' lat='33.66606' lon='103.77891' />
+ <node id='-89354' lat='33.68435' lon='104.10026' />
+ <node id='-89356' lat='33.35978' lon='104.28634' />
+ <node id='-89358' lat='33.32938' lon='104.45526' />
+ <node id='-89360' lat='33.19790' lon='104.33921' />
+ <node id='-89362' lat='33.00636' lon='104.43260' />
+ <node id='-89364' lat='32.79189' lon='104.40238' />
+ <node id='-89366' lat='32.60004' lon='105.11032' />
+ <node id='-89368' lat='32.72433' lon='105.39321' />
+ <node id='-89370' lat='32.94875' lon='105.43647' />
+ <node id='-89372' lat='32.70526' lon='105.62461' />
+ <node id='-89374' lat='32.86805' lon='106.04484' />
+ <node id='-89376' lat='32.72144' lon='106.11007' />
+ <node id='-89378' lat='32.63070' lon='106.43073' />
+ <node id='-89380' lat='32.71855' lon='106.85851' />
+ <node id='-89382' lat='32.67174' lon='107.10090' />
+ <node id='-89384' lat='32.48543' lon='107.12150' />
+ <node id='-89386' lat='32.40779' lon='107.25677' />
+ <node id='-89388' lat='32.55433' lon='107.42362' />
+ <node id='-89390' lat='32.13782' lon='107.97569' />
+ <node id='-89392' lat='32.28365' lon='108.25309' />
+ <node id='-89394' lat='32.20641' lon='108.50234' />
+ <node id='-89396' lat='31.92885' lon='108.27369' />
+ <node id='-89398' lat='31.67559' lon='108.54011' />
+ <node id='-89400' lat='31.24803' lon='108.02032' />
+ <node id='-89402' lat='31.18049' lon='108.07182' />
+ <node id='-89404' lat='30.92578' lon='107.92282' />
+ <node id='-89406' lat='30.91076' lon='107.99114' />
+ <node id='-89408' lat='30.79405' lon='107.84866' />
+ <node id='-89410' lat='30.87600' lon='107.69657' />
+ <node id='-89412' lat='30.81233' lon='107.63683' />
+ <node id='-89414' lat='30.84476' lon='107.48508' />
+ <node id='-89416' lat='30.73180' lon='107.42637' />
+ <node id='-89418' lat='30.63732' lon='107.50431' />
+ <node id='-89420' lat='30.18727' lon='107.19291' />
+ <node id='-89422' lat='30.04532' lon='107.03155' />
+ <node id='-89424' lat='30.08484' lon='106.96941' />
+ <node id='-89426' lat='30.01738' lon='106.76582' />
+ <node id='-89428' lat='30.32843' lon='106.54643' />
+ <node id='-89430' lat='30.18134' lon='106.21067' />
+ <node id='-89432' lat='30.30413' lon='106.16397' />
+ <node id='-89434' lat='30.44393' lon='105.79627' />
+ <node id='-89436' lat='30.26618' lon='105.68778' />
+ <node id='-89438' lat='30.26381' lon='105.61431' />
+ <node id='-89440' lat='30.11216' lon='105.59062' />
+ <node id='-89442' lat='30.01619' lon='105.75302' />
+ <node id='-89444' lat='29.83796' lon='105.70667' />
+ <node id='-89446' lat='29.83707' lon='105.60127' />
+ <node id='-89448' lat='29.67612' lon='105.45707' />
+ <node id='-89450' lat='29.58122' lon='105.29193' />
+ <node id='-89452' lat='29.42285' lon='105.37261' />
+ <node id='-89454' lat='29.40131' lon='105.44128' />
+ <node id='-89456' lat='29.31783' lon='105.43888' />
+ <node id='-89458' lat='29.24357' lon='105.65036' />
+ <node id='-89460' lat='29.30047' lon='105.71010' />
+ <node id='-89462' lat='29.01894' lon='105.74958' />
+ <node id='-89464' lat='28.90540' lon='105.90408' />
+ <node id='-89466' lat='28.97811' lon='106.00330' />
+ <node id='-89468' lat='28.83715' lon='106.26113' />
+ <node id='-89470' lat='28.52662' lon='106.36756' />
+ <node id='-89472' lat='28.74960' lon='105.96588' />
+ <node id='-89474' lat='28.60200' lon='105.88142' />
+ <node id='-89476' lat='28.57547' lon='105.68778' />
+ <node id='-89478' lat='28.43488' lon='105.61981' />
+ <node id='-89480' lat='28.30800' lon='105.65895' />
+ <node id='-89482' lat='28.23785' lon='105.88760' />
+ <node id='-89484' lat='28.12770' lon='105.92330' />
+ <node id='-89486' lat='28.16948' lon='106.13857' />
+ <node id='-89488' lat='28.13497' lon='106.20826' />
+ <node id='-89490' lat='27.83907' lon='106.35864' />
+ <node id='-89492' lat='27.72973' lon='105.92262' />
+ <node id='-89494' lat='27.69751' lon='105.60676' />
+ <node id='-90091' lat='36.95208' lon='105.18997' />
+ <node id='-90093' lat='36.09960' lon='105.51544' />
+ <node id='-90095' lat='35.99911' lon='105.32592' />
+ <node id='-90097' lat='35.72756' lon='105.48454' />
+ <node id='-90099' lat='35.48639' lon='106.05857' />
+ <node id='-90101' lat='35.23889' lon='106.36344' />
+ <node id='-90103' lat='35.35993' lon='106.49940' />
+ <node id='-90105' lat='35.69466' lon='106.44241' />
+ <node id='-90107' lat='35.76824' lon='106.92100' />
+ <node id='-90109' lat='36.12456' lon='106.93130' />
+ <node id='-90111' lat='36.30848' lon='106.49047' />
+ <node id='-90113' lat='37.19751' lon='106.66076' />
+ <node id='-90115' lat='37.09790' lon='107.30346' />
+ <node id='-90119' lat='37.87999' lon='107.66139' />
+ <node id='-90143' lat='36.90378' lon='107.34878' />
+ <node id='-90145' lat='36.41023' lon='108.65890' />
+ <node id='-90147' lat='35.95021' lon='108.64654' />
+ <node id='-90149' lat='35.31176' lon='108.58886' />
+ <node id='-90151' lat='35.26524' lon='107.84248' />
+ <node id='-90153' lat='35.30896' lon='107.70790' />
+ <node id='-90155' lat='34.97487' lon='107.84660' />
+ <node id='-90157' lat='34.90620' lon='107.18604' />
+ <node id='-90159' lat='35.02887' lon='107.05833' />
+ <node id='-90161' lat='35.09238' lon='106.76788' />
+ <node id='-90163' lat='35.05754' lon='106.48635' />
+ <node id='-90165' lat='34.74443' lon='106.56120' />
+ <node id='-90167' lat='34.55972' lon='106.33186' />
+ <node id='-90169' lat='34.51532' lon='106.33220' />
+ <node id='-90171' lat='34.52183' lon='106.47399' />
+ <node id='-90173' lat='34.44797' lon='106.61750' />
+ <node id='-90175' lat='34.38651' lon='106.64188' />
+ <node id='-90177' lat='34.37092' lon='106.71295' />
+ <node id='-90179' lat='33.89777' lon='106.41357' />
+ <node id='-90181' lat='33.57000' lon='106.58523' />
+ <node id='-90183' lat='33.50246' lon='106.51519' />
+ <node id='-90185' lat='33.61347' lon='106.36688' />
+ <node id='-90187' lat='33.61061' lon='105.95764' />
+ <node id='-90189' lat='33.36322' lon='105.72624' />
+ <node id='-90191' lat='33.15652' lon='105.96244' />
+ <node id='-90193' lat='32.93896' lon='105.85945' />
+ <node id='-90195' lat='32.89406' lon='105.47878' />
+ <node id='-90234' lat='37.47921' lon='107.27050' />
+ <node id='-90294' lat='46.28812' lon='123.90655' />
+ <node id='-90296' lat='45.61692' lon='124.13452' />
+ <node id='-90298' lat='45.41002' lon='124.55612' />
+ <node id='-90300' lat='45.50346' lon='125.68771' />
+ <node id='-90302' lat='45.12296' lon='126.00768' />
+ <node id='-90304' lat='45.23621' lon='126.65313' />
+ <node id='-90306' lat='44.93369' lon='127.08846' />
+ <node id='-90308' lat='44.59242' lon='127.03765' />
+ <node id='-90310' lat='44.55525' lon='127.53753' />
+ <node id='-90312' lat='44.03429' lon='127.71331' />
+ <node id='-90314' lat='44.50825' lon='128.43429' />
+ <node id='-90316' lat='43.50374' lon='128.88198' />
+ <node id='-90318' lat='44.06193' lon='129.94903' />
+ <node id='-90320' lat='43.80480' lon='130.07537' />
+ <node id='-90322' lat='44.03824' lon='130.38574' />
+ <node id='-90324' lat='43.63905' lon='130.44616' />
+ <node id='-90450' lat='43.49627' lon='123.79806' />
+ <node id='-90452' lat='43.24120' lon='124.14619' />
+ <node id='-90454' lat='43.21268' lon='124.28077' />
+ <node id='-90456' lat='43.14608' lon='124.28832' />
+ <node id='-90458' lat='43.06738' lon='124.41261' />
+ <node id='-90460' lat='42.88854' lon='124.35836' />
+ <node id='-90462' lat='42.81907' lon='124.45793' />
+ <node id='-90464' lat='43.17563' lon='124.85961' />
+ <node id='-90466' lat='42.79086' lon='124.84863' />
+ <node id='-90468' lat='42.77574' lon='124.97909' />
+ <node id='-90470' lat='42.29813' lon='125.18096' />
+ <node id='-90472' lat='42.31387' lon='125.25443' />
+ <node id='-90474' lat='42.09159' lon='125.41854' />
+ <node id='-90476' lat='41.95540' lon='125.28671' />
+ <node id='-90478' lat='41.67034' lon='125.32241' />
+ <node id='-90480' lat='41.67393' lon='125.44738' />
+ <node id='-90482' lat='41.53222' lon='125.49167' />
+ <node id='-90484' lat='41.39767' lon='125.54283' />
+ <node id='-90486' lat='41.39174' lon='125.57544' />
+ <node id='-90488' lat='41.33325' lon='125.63449' />
+ <node id='-90490' lat='41.26877' lon='125.63724' />
+ <node id='-90492' lat='41.23005' lon='125.75225' />
+ <node id='-90494' lat='41.16185' lon='125.78487' />
+ <node id='-90496' lat='40.95086' lon='125.63552' />
+ <node id='-90498' lat='40.89327' lon='125.56892' />
+ <node id='-90500' lat='40.91403' lon='125.66574' />
+ <node id='-90502' lat='40.85223' lon='125.71172' />
+ <node id='-90624' lat='38.45359' lon='120.97044' />
+ <node id='-90626' lat='40.11431' lon='119.73586' />
+ <node id='-90628' lat='40.36799' lon='119.58137' />
+ <node id='-90630' lat='40.54876' lon='119.55253' />
+ <node id='-90632' lat='40.53154' lon='119.26277' />
+ <node id='-90634' lat='40.67647' lon='119.12406' />
+ <node id='-90636' lat='40.75297' lon='118.90296' />
+ <node id='-90638' lat='40.95760' lon='118.88992' />
+ <node id='-90640' lat='40.97523' lon='119.01695' />
+ <node id='-90642' lat='41.06382' lon='118.92631' />
+ <node id='-90644' lat='41.08608' lon='119.07325' />
+ <node id='-90646' lat='41.27264' lon='119.24972' />
+ <node id='-90648' lat='41.31490' lon='119.23562' />
+ <node id='-90757' lat='8.44758' lon='77.22358' />
+ <node id='-90759' lat='8.50734' lon='77.20024' />
+ <node id='-90761' lat='8.52296' lon='77.27954' />
+ <node id='-90763' lat='8.73850' lon='77.17655' />
+ <node id='-90765' lat='8.84300' lon='77.26135' />
+ <node id='-90767' lat='9.01496' lon='77.15045' />
+ <node id='-90769' lat='9.51543' lon='77.42065' />
+ <node id='-90771' lat='9.61632' lon='77.16865' />
+ <node id='-90773' lat='9.80447' lon='77.24693' />
+ <node id='-90775' lat='10.02971' lon='77.25997' />
+ <node id='-90777' lat='10.11759' lon='77.20298' />
+ <node id='-90779' lat='10.13382' lon='77.27645' />
+ <node id='-90781' lat='10.36423' lon='77.21465' />
+ <node id='-90783' lat='10.22100' lon='76.96403' />
+ <node id='-90785' lat='10.32370' lon='76.82327' />
+ <node id='-90787' lat='10.63159' lon='76.80679' />
+ <node id='-90789' lat='10.63226' lon='76.87236' />
+ <node id='-90791' lat='10.68051' lon='76.85691' />
+ <node id='-90793' lat='10.77327' lon='76.89880' />
+ <node id='-90795' lat='10.81138' lon='76.84112' />
+ <node id='-90797' lat='10.86163' lon='76.81777' />
+ <node id='-90799' lat='10.92400' lon='76.64920' />
+ <node id='-90801' lat='11.20736' lon='76.72370' />
+ <node id='-90803' lat='11.19456' lon='76.43531' />
+ <node id='-90805' lat='11.35079' lon='76.53934' />
+ <node id='-90807' lat='11.51871' lon='76.23344' />
+ <node id='-90809' lat='11.58699' lon='76.23722' />
+ <node id='-90811' lat='11.59136' lon='76.37145' />
+ <node id='-90813' lat='11.66568' lon='76.42948' />
+ <node id='-90815' lat='11.87608' lon='76.18949' />
+ <node id='-90817' lat='11.85105' lon='76.11757' />
+ <node id='-90819' lat='11.97887' lon='76.11259' />
+ <node id='-90821' lat='11.93185' lon='76.00307' />
+ <node id='-90823' lat='11.95502' lon='75.86059' />
+ <node id='-90825' lat='12.08296' lon='75.78987' />
+ <node id='-90827' lat='12.20279' lon='75.54302' />
+ <node id='-90829' lat='12.29103' lon='75.49392' />
+ <node id='-90831' lat='12.31249' lon='75.43109' />
+ <node id='-90833' lat='12.45602' lon='75.37067' />
+ <node id='-90835' lat='12.47144' lon='75.43659' />
+ <node id='-90837' lat='12.50161' lon='75.39882' />
+ <node id='-90839' lat='12.46105' lon='75.34698' />
+ <node id='-90841' lat='12.55020' lon='75.27214' />
+ <node id='-90843' lat='12.57534' lon='75.33393' />
+ <node id='-90845' lat='12.61856' lon='75.28106' />
+ <node id='-90847' lat='12.56662' lon='75.23471' />
+ <node id='-90849' lat='12.61320' lon='75.19798' />
+ <node id='-90851' lat='12.63648' lon='75.14579' />
+ <node id='-90853' lat='12.67969' lon='75.16124' />
+ <node id='-90855' lat='12.67752' lon='75.11438' />
+ <node id='-90857' lat='12.70029' lon='75.08777' />
+ <node id='-90859' lat='12.66228' lon='75.06872' />
+ <node id='-90861' lat='12.67484' lon='75.04108' />
+ <node id='-90863' lat='12.71804' lon='75.05310' />
+ <node id='-90869' lat='12.73998' lon='74.98323' />
+ <node id='-90871' lat='12.79137' lon='75.01327' />
+ <node id='-90873' lat='12.76057' lon='74.86049' />
+ <node id='-90875' lat='12.69394' lon='74.66307' />
+ <node id='-90878' lat='7.82138' lon='76.72283' />
+ <node id='-90924' lat='11.69123' lon='76.53900' />
+ <node id='-90926' lat='11.60717' lon='76.61281' />
+ <node id='-90928' lat='11.59506' lon='76.85623' />
+ <node id='-90930' lat='11.66938' lon='76.84249' />
+ <node id='-90932' lat='11.79308' lon='76.91013' />
+ <node id='-90934' lat='11.77628' lon='76.97193' />
+ <node id='-90936' lat='11.81291' lon='76.98772' />
+ <node id='-90938' lat='11.71863' lon='77.12059' />
+ <node id='-90940' lat='11.81241' lon='77.25465' />
+ <node id='-90942' lat='11.76199' lon='77.42906' />
+ <node id='-90944' lat='11.84887' lon='77.46665' />
+ <node id='-90946' lat='11.94260' lon='77.49704' />
+ <node id='-90948' lat='11.94898' lon='77.67917' />
+ <node id='-90950' lat='12.05409' lon='77.72724' />
+ <node id='-90952' lat='12.11200' lon='77.77925' />
+ <node id='-90954' lat='12.17963' lon='77.72500' />
+ <node id='-90956' lat='12.20681' lon='77.45738' />
+ <node id='-90958' lat='12.27660' lon='77.48931' />
+ <node id='-90960' lat='12.36649' lon='77.61806' />
+ <node id='-90962' lat='12.49088' lon='77.63523' />
+ <node id='-90964' lat='12.51803' lon='77.58853' />
+ <node id='-90966' lat='12.66579' lon='77.60089' />
+ <node id='-90968' lat='12.68363' lon='77.67514' />
+ <node id='-90970' lat='12.65625' lon='77.67943' />
+ <node id='-90972' lat='12.66395' lon='77.71265' />
+ <node id='-90974' lat='12.68170' lon='77.71196' />
+ <node id='-90976' lat='12.67065' lon='77.74114' />
+ <node id='-90978' lat='12.69962' lon='77.73994' />
+ <node id='-90980' lat='12.69560' lon='77.76329' />
+ <node id='-90982' lat='12.72273' lon='77.77582' />
+ <node id='-90984' lat='12.72658' lon='77.76277' />
+ <node id='-90986' lat='12.73663' lon='77.76620' />
+ <node id='-90988' lat='12.74768' lon='77.79384' />
+ <node id='-90990' lat='12.76928' lon='77.78062' />
+ <node id='-90994' lat='12.82987' lon='77.81032' />
+ <node id='-90996' lat='12.84092' lon='77.79247' />
+ <node id='-90998' lat='12.86151' lon='77.83281' />
+ <node id='-91002' lat='12.88192' lon='77.93683' />
+ <node id='-91008' lat='12.82828' lon='77.91975' />
+ <node id='-91010' lat='12.83540' lon='77.94782' />
+ <node id='-91012' lat='12.85966' lon='77.95349' />
+ <node id='-91014' lat='12.83105' lon='77.97005' />
+ <node id='-91018' lat='12.80359' lon='78.00215' />
+ <node id='-91020' lat='12.85406' lon='78.03322' />
+ <node id='-91022' lat='12.83146' lon='78.08678' />
+ <node id='-91054' lat='12.76861' lon='78.12309' />
+ <node id='-91056' lat='12.76526' lon='78.23295' />
+ <node id='-91058' lat='12.86469' lon='78.26076' />
+ <node id='-91060' lat='12.85966' lon='78.31500' />
+ <node id='-91062' lat='12.93965' lon='78.35706' />
+ <node id='-91064' lat='12.90652' lon='78.39054' />
+ <node id='-91066' lat='12.86971' lon='78.46813' />
+ <node id='-91068' lat='12.90334' lon='78.46744' />
+ <node id='-91070' lat='12.92743' lon='78.43809' />
+ <node id='-91072' lat='12.94517' lon='78.40908' />
+ <node id='-91074' lat='12.98699' lon='78.47637' />
+ <node id='-91082' lat='13.18061' lon='78.57181' />
+ <node id='-91084' lat='13.31512' lon='78.57439' />
+ <node id='-91090' lat='13.36340' lon='78.36547' />
+ <node id='-91092' lat='13.40581' lon='78.38058' />
+ <node id='-91094' lat='13.50748' lon='78.37818' />
+ <node id='-91096' lat='13.59343' lon='78.40461' />
+ <node id='-91098' lat='13.58592' lon='78.19879' />
+ <node id='-91100' lat='13.64348' lon='78.19965' />
+ <node id='-91102' lat='13.65716' lon='78.11622' />
+ <node id='-91104' lat='13.76456' lon='78.11485' />
+ <node id='-91106' lat='13.86208' lon='78.12635' />
+ <node id='-91108' lat='13.88791' lon='78.06146' />
+ <node id='-91110' lat='13.93440' lon='77.95160' />
+ <node id='-91112' lat='13.93523' lon='77.81839' />
+ <node id='-91114' lat='13.86158' lon='77.83229' />
+ <node id='-91116' lat='13.78890' lon='77.72209' />
+ <node id='-91118' lat='13.74021' lon='77.71934' />
+ <node id='-91120' lat='13.78773' lon='77.67110' />
+ <node id='-91122' lat='13.72721' lon='77.56227' />
+ <node id='-91124' lat='13.75839' lon='77.52450' />
+ <node id='-91126' lat='13.69585' lon='77.52983' />
+ <node id='-91128' lat='13.71303' lon='77.49206' />
+ <node id='-91130' lat='13.67751' lon='77.48022' />
+ <node id='-91132' lat='13.70236' lon='77.45326' />
+ <node id='-91134' lat='13.76289' lon='77.47369' />
+ <node id='-91136' lat='13.81057' lon='77.45206' />
+ <node id='-91138' lat='13.84541' lon='77.41945' />
+ <node id='-91140' lat='13.85341' lon='77.26221' />
+ <node id='-91142' lat='13.90824' lon='77.23766' />
+ <node id='-91144' lat='13.90340' lon='77.16556' />
+ <node id='-91146' lat='13.84891' lon='77.13020' />
+ <node id='-91148' lat='13.76189' lon='77.18393' />
+ <node id='-91150' lat='13.76739' lon='77.05278' />
+ <node id='-91152' lat='13.78256' lon='77.03081' />
+ <node id='-91154' lat='13.72837' lon='77.00265' />
+ <node id='-91156' lat='13.82941' lon='76.97862' />
+ <node id='-91158' lat='13.92140' lon='77.05141' />
+ <node id='-91160' lat='14.00020' lon='76.98772' />
+ <node id='-91162' lat='14.01719' lon='76.93948' />
+ <node id='-91164' lat='14.05233' lon='76.94463' />
+ <node id='-91166' lat='14.08596' lon='76.98326' />
+ <node id='-91168' lat='14.14156' lon='76.88112' />
+ <node id='-91170' lat='14.19233' lon='76.95339' />
+ <node id='-91172' lat='14.16736' lon='77.02651' />
+ <node id='-91174' lat='14.05432' lon='77.02840' />
+ <node id='-91176' lat='14.03684' lon='77.13415' />
+ <node id='-91178' lat='13.99187' lon='77.15234' />
+ <node id='-91180' lat='14.03084' lon='77.31954' />
+ <node id='-91182' lat='13.93390' lon='77.35765' />
+ <node id='-91184' lat='13.88791' lon='77.41172' />
+ <node id='-91186' lat='13.94772' lon='77.45017' />
+ <node id='-91188' lat='13.98237' lon='77.43215' />
+ <node id='-91190' lat='14.03967' lon='77.33791' />
+ <node id='-91192' lat='14.12026' lon='77.40949' />
+ <node id='-91196' lat='14.17419' lon='77.38924' />
+ <node id='-91198' lat='14.15754' lon='77.51472' />
+ <node id='-91200' lat='14.29332' lon='77.48502' />
+ <node id='-91202' lat='14.34954' lon='77.36280' />
+ <node id='-91206' lat='14.19998' lon='77.42820' />
+ <node id='-91208' lat='14.21113' lon='77.37670' />
+ <node id='-91212' lat='14.33241' lon='77.27045' />
+ <node id='-91214' lat='14.33923' lon='77.13466' />
+ <node id='-91216' lat='14.19100' lon='77.08660' />
+ <node id='-91218' lat='14.24774' lon='77.04952' />
+ <node id='-91220' lat='14.24624' lon='76.93862' />
+ <node id='-91222' lat='14.39660' lon='76.89125' />
+ <node id='-91226' lat='14.48288' lon='76.98205' />
+ <node id='-91228' lat='14.53257' lon='76.80335' />
+ <node id='-91230' lat='14.67925' lon='76.76628' />
+ <node id='-91232' lat='14.84010' lon='76.86309' />
+ <node id='-91234' lat='14.97082' lon='76.86996' />
+ <node id='-91236' lat='14.98442' lon='76.76336' />
+ <node id='-91240' lat='15.09681' lon='76.80044' />
+ <node id='-91242' lat='15.00945' lon='76.98308' />
+ <node id='-91244' lat='15.02985' lon='77.11320' />
+ <node id='-91246' lat='15.17619' lon='77.17037' />
+ <node id='-91250' lat='15.29279' lon='77.16281' />
+ <node id='-91252' lat='15.37292' lon='77.04145' />
+ <node id='-91254' lat='15.43614' lon='77.03201' />
+ <node id='-91256' lat='15.50992' lon='76.97227' />
+ <node id='-91264' lat='15.71625' lon='77.09278' />
+ <node id='-91266' lat='15.85600' lon='77.03613' />
+ <node id='-91268' lat='15.94036' lon='77.11818' />
+ <node id='-91270' lat='15.96132' lon='77.27113' />
+ <node id='-91272' lat='15.94548' lon='77.44039' />
+ <node id='-91274' lat='15.92864' lon='77.51197' />
+ <node id='-91280' lat='16.26906' lon='77.49893' />
+ <node id='-91282' lat='16.29657' lon='77.60364' />
+ <node id='-91284' lat='16.34336' lon='77.59523' />
+ <node id='-91286' lat='16.38223' lon='77.48451' />
+ <node id='-91288' lat='16.40595' lon='77.28847' />
+ <node id='-91290' lat='16.47658' lon='77.23440' />
+ <node id='-91292' lat='16.48942' lon='77.32366' />
+ <node id='-91294' lat='16.48481' lon='77.37636' />
+ <node id='-91298' lat='16.58700' lon='77.47198' />
+ <node id='-91304' lat='16.71216' lon='77.47095' />
+ <node id='-91306' lat='16.72252' lon='77.42700' />
+ <node id='-91308' lat='16.78712' lon='77.44279' />
+ <node id='-91310' lat='16.77956' lon='77.47489' />
+ <node id='-91312' lat='16.92068' lon='77.45532' />
+ <node id='-91314' lat='17.01657' lon='77.50099' />
+ <node id='-91316' lat='17.11454' lon='77.46356' />
+ <node id='-91318' lat='17.15883' lon='77.36623' />
+ <node id='-91322' lat='17.28607' lon='77.46202' />
+ <node id='-91324' lat='17.37210' lon='77.45155' />
+ <node id='-91326' lat='17.35178' lon='77.52244' />
+ <node id='-91328' lat='17.44007' lon='77.53583' />
+ <node id='-91330' lat='17.44335' lon='77.62716' />
+ <node id='-91334' lat='17.52751' lon='77.67608' />
+ <node id='-91336' lat='17.57693' lon='77.52571' />
+ <node id='-91338' lat='17.57693' lon='77.44005' />
+ <node id='-91340' lat='17.70568' lon='77.45841' />
+ <node id='-91342' lat='17.74378' lon='77.57823' />
+ <node id='-91344' lat='17.79298' lon='77.50837' />
+ <node id='-91346' lat='17.96860' lon='77.66166' />
+ <node id='-91350' lat='18.04925' lon='77.56296' />
+ <node id='-91352' lat='18.10033' lon='77.61377' />
+ <node id='-91358' lat='18.55220' lon='77.60965' />
+ <node id='-91360' lat='18.55204' lon='77.73994' />
+ <node id='-91362' lat='18.68267' lon='77.74251' />
+ <node id='-91364' lat='18.81905' lon='77.85684' />
+ <node id='-91366' lat='18.82604' lon='77.94353' />
+ <node id='-91368' lat='19.02577' lon='77.74251' />
+ <node id='-91370' lat='19.18359' lon='77.84379' />
+ <node id='-91372' lat='19.32070' lon='77.86422' />
+ <node id='-91374' lat='19.30158' lon='78.00653' />
+ <node id='-91376' lat='19.22898' lon='78.14695' />
+ <node id='-91378' lat='19.42903' lon='78.19141' />
+ <node id='-91380' lat='19.46885' lon='78.30110' />
+ <node id='-91382' lat='19.69544' lon='78.26694' />
+ <node id='-91384' lat='19.75604' lon='78.35861' />
+ <node id='-91386' lat='19.90476' lon='78.27449' />
+ <node id='-91396' lat='19.75749' lon='78.82793' />
+ <node id='-91398' lat='19.65778' lon='78.84613' />
+ <node id='-91400' lat='19.66037' lon='78.95839' />
+ <node id='-91402' lat='19.54943' lon='78.94432' />
+ <node id='-91404' lat='19.46044' lon='79.19048' />
+ <node id='-91406' lat='19.61219' lon='79.23408' />
+ <node id='-91408' lat='19.49928' lon='79.47578' />
+ <node id='-91416' lat='19.57887' lon='79.63165' />
+ <node id='-91418' lat='19.60054' lon='79.80400' />
+ <node id='-91420' lat='19.50090' lon='79.86991' />
+ <node id='-91422' lat='19.47792' lon='79.93858' />
+ <node id='-91424' lat='19.35358' lon='79.97051' />
+ <node id='-91432' lat='18.86145' lon='79.96261' />
+ <node id='-91434' lat='18.82474' lon='79.90940' />
+ <node id='-91436' lat='18.68690' lon='80.11196' />
+ <node id='-91438' lat='18.72104' lon='80.27503' />
+ <node id='-91440' lat='18.28849' lon='77.56785' />
+ <node id='-91445' lat='18.31183' lon='77.50820' />
+ <node id='-91447' lat='18.26847' lon='77.49343' />
+ <node id='-91449' lat='18.31118' lon='77.42752' />
+ <node id='-91451' lat='18.30857' lon='77.35988' />
+ <node id='-91453' lat='18.39427' lon='77.41653' />
+ <node id='-91455' lat='18.40095' lon='77.37138' />
+ <node id='-91457' lat='18.45225' lon='77.36108' />
+ <node id='-91459' lat='18.41838' lon='77.32400' />
+ <node id='-91461' lat='18.44053' lon='77.30718' />
+ <node id='-91463' lat='18.40714' lon='77.24899' />
+ <node id='-91473' lat='18.27850' lon='77.20822' />
+ <node id='-91475' lat='18.28453' lon='77.17234' />
+ <node id='-91477' lat='18.19869' lon='77.11741' />
+ <node id='-91481' lat='18.15775' lon='77.11758' />
+ <node id='-91483' lat='18.15955' lon='77.05355' />
+ <node id='-91485' lat='18.18189' lon='77.03733' />
+ <node id='-91487' lat='18.16053' lon='77.00351' />
+ <node id='-91489' lat='18.19355' lon='76.98205' />
+ <node id='-91491' lat='18.12431' lon='76.91871' />
+ <node id='-91493' lat='18.09592' lon='76.96660' />
+ <node id='-91495' lat='18.08042' lon='76.94532' />
+ <node id='-91497' lat='18.03848' lon='76.94978' />
+ <node id='-91499' lat='18.03489' lon='76.91596' />
+ <node id='-91501' lat='17.96779' lon='76.91305' />
+ <node id='-91503' lat='17.91291' lon='76.92043' />
+ <node id='-91505' lat='17.89413' lon='76.88129' />
+ <node id='-91509' lat='17.90001' lon='76.76868' />
+ <node id='-91511' lat='17.88269' lon='76.73830' />
+ <node id='-91513' lat='17.82289' lon='76.79134' />
+ <node id='-91519' lat='17.72792' lon='76.69898' />
+ <node id='-91525' lat='17.68082' lon='76.68920' />
+ <node id='-91527' lat='17.77631' lon='76.61178' />
+ <node id='-91529' lat='17.70061' lon='76.57402' />
+ <node id='-91531' lat='17.76928' lon='76.56423' />
+ <node id='-91533' lat='17.75833' lon='76.52166' />
+ <node id='-91535' lat='17.71925' lon='76.51720' />
+ <node id='-91537' lat='17.71206' lon='76.48424' />
+ <node id='-91539' lat='17.60426' lon='76.40201' />
+ <node id='-91541' lat='17.57939' lon='76.32974' />
+ <node id='-91543' lat='17.49468' lon='76.34674' />
+ <node id='-91547' lat='17.45580' lon='76.33043' />
+ <node id='-91549' lat='17.42943' lon='76.37128' />
+ <node id='-91551' lat='17.37259' lon='76.37592' />
+ <node id='-91553' lat='17.35260' lon='76.40596' />
+ <node id='-91555' lat='17.30885' lon='76.36545' />
+ <node id='-91557' lat='17.33998' lon='76.31429' />
+ <node id='-91559' lat='17.32917' lon='76.27326' />
+ <node id='-91561' lat='17.37652' lon='76.24031' />
+ <node id='-91563' lat='17.34654' lon='76.17439' />
+ <node id='-91565' lat='17.30459' lon='76.18606' />
+ <node id='-91567' lat='17.37242' lon='76.11928' />
+ <node id='-91569' lat='17.33081' lon='76.07276' />
+ <node id='-91571' lat='17.36178' lon='76.05525' />
+ <node id='-91575' lat='17.32835' lon='75.92428' />
+ <node id='-91577' lat='17.36816' lon='75.89200' />
+ <node id='-91579' lat='17.42517' lon='75.82609' />
+ <node id='-91581' lat='17.40994' lon='75.69425' />
+ <node id='-91585' lat='17.49346' lon='75.63846' />
+ <node id='-91587' lat='17.34883' lon='75.58439' />
+ <node id='-91589' lat='16.95303' lon='75.68206' />
+ <node id='-91591' lat='16.95697' lon='75.27969' />
+ <node id='-91593' lat='16.83214' lon='75.20553' />
+ <node id='-91595' lat='16.95566' lon='75.07713' />
+ <node id='-91597' lat='16.93793' lon='74.92744' />
+ <node id='-91599' lat='16.77101' lon='74.90341' />
+ <node id='-91601' lat='16.71380' lon='74.69398' />
+ <node id='-91603' lat='16.57762' lon='74.62840' />
+ <node id='-91605' lat='16.65888' lon='74.46910' />
+ <node id='-91607' lat='16.53748' lon='74.37057' />
+ <node id='-91609' lat='16.51904' lon='74.26483' />
+ <node id='-91611' lat='16.37746' lon='74.35958' />
+ <node id='-91613' lat='16.31816' lon='74.32662' />
+ <node id='-91615' lat='16.22489' lon='74.50241' />
+ <node id='-91617' lat='16.09694' lon='74.48249' />
+ <node id='-91619' lat='16.10255' lon='74.41486' />
+ <node id='-91621' lat='16.03822' lon='74.36576' />
+ <node id='-91623' lat='16.04746' lon='74.46292' />
+ <node id='-91625' lat='15.85171' lon='74.33967' />
+ <node id='-91627' lat='15.76417' lon='74.34345' />
+ <node id='-91629' lat='15.77903' lon='74.20165' />
+ <node id='-91631' lat='15.65411' lon='74.11617' />
+ <node id='-91633' lat='15.64551' lon='74.25659' />
+ <node id='-91635' lat='15.49206' lon='74.24903' />
+ <node id='-91637' lat='15.28352' lon='74.33486' />
+ <node id='-91639' lat='15.25371' lon='74.25075' />
+ <node id='-91641' lat='15.18050' lon='74.31838' />
+ <node id='-91643' lat='15.09996' lon='74.27410' />
+ <node id='-91645' lat='15.02869' lon='74.29195' />
+ <node id='-91647' lat='14.92819' lon='74.20543' />
+ <node id='-91649' lat='14.94976' lon='74.16217' />
+ <node id='-91651' lat='14.75496' lon='73.87481' />
+ <node id='-91692' lat='15.60253' lon='74.01592' />
+ <node id='-91694' lat='15.62799' lon='73.97472' />
+ <node id='-91696' lat='15.74236' lon='73.94691' />
+ <node id='-91704' lat='15.74401' lon='73.80477' />
+ <node id='-91708' lat='15.72484' lon='73.68598' />
+ <node id='-91710' lat='15.61245' lon='73.34747' />
+ <node id='-91725' lat='18.59158' lon='80.34782' />
+ <node id='-91727' lat='18.62802' lon='80.51055' />
+ <node id='-91731' lat='17.77615' lon='81.05026' />
+ <node id='-91733' lat='17.81014' lon='81.39221' />
+ <node id='-91735' lat='17.88596' lon='81.77398' />
+ <node id='-91737' lat='17.35850' lon='81.40594' />
+ <node id='-91741' lat='17.20081' lon='80.91499' />
+ <node id='-91743' lat='17.02494' lon='80.83671' />
+ <node id='-91745' lat='17.06794' lon='80.68771' />
+ <node id='-91747' lat='17.13226' lon='80.61733' />
+ <node id='-91749' lat='17.10830' lon='80.50369' />
+ <node id='-91751' lat='17.01772' lon='80.44670' />
+ <node id='-91753' lat='17.08139' lon='80.38867' />
+ <node id='-91755' lat='16.96683' lon='80.36189' />
+ <node id='-91757' lat='16.91855' lon='80.57544' />
+ <node id='-91759' lat='16.77200' lon='80.58711' />
+ <node id='-91761' lat='16.78810' lon='80.45871' />
+ <node id='-91763' lat='16.81702' lon='80.45391' />
+ <node id='-91765' lat='16.85613' lon='80.40138' />
+ <node id='-91771' lat='16.87387' lon='80.31864' />
+ <node id='-91773' lat='17.00820' lon='80.26027' />
+ <node id='-91775' lat='17.04628' lon='80.18199' />
+ <node id='-91777' lat='16.96256' lon='80.04432' />
+ <node id='-91779' lat='16.86040' lon='79.99248' />
+ <node id='-91781' lat='16.81242' lon='80.07350' />
+ <node id='-91783' lat='16.71249' lon='80.02544' />
+ <node id='-91785' lat='16.62731' lon='79.94476' />
+ <node id='-91793' lat='16.72137' lon='79.79507' />
+ <node id='-91799' lat='16.57302' lon='79.31304' />
+ <node id='-91801' lat='16.48251' lon='79.21485' />
+ <node id='-91803' lat='16.21665' lon='79.21623' />
+ <node id='-91813' lat='16.04581' lon='78.68408' />
+ <node id='-91815' lat='16.08012' lon='78.41766' />
+ <node id='-91819' lat='15.82892' lon='78.12000' />
+ <node id='-91821' lat='15.90421' lon='78.03108' />
+ <node id='-91823' lat='15.88869' lon='77.65754' />
+ <node id='-91878' lat='18.06622' lon='82.04383' />
+ <node id='-91880' lat='17.98199' lon='82.25532' />
+ <node id='-91882' lat='18.14193' lon='82.35351' />
+ <node id='-91884' lat='18.49198' lon='82.42835' />
+ <node id='-91886' lat='18.23522' lon='82.63366' />
+ <node id='-91888' lat='18.43727' lon='82.82592' />
+ <node id='-91890' lat='18.33692' lon='82.96737' />
+ <node id='-91892' lat='18.54081' lon='83.08822' />
+ <node id='-91894' lat='18.77176' lon='83.11019' />
+ <node id='-91896' lat='18.83481' lon='83.37936' />
+ <node id='-91898' lat='19.01084' lon='83.33816' />
+ <node id='-91900' lat='19.12311' lon='83.65058' />
+ <node id='-91902' lat='18.80296' lon='83.88748' />
+ <node id='-91904' lat='18.79581' lon='84.03991' />
+ <node id='-91906' lat='18.74478' lon='84.08128' />
+ <node id='-91908' lat='18.78883' lon='84.22840' />
+ <node id='-91910' lat='18.78411' lon='84.31594' />
+ <node id='-91912' lat='19.04394' lon='84.50408' />
+ <node id='-91914' lat='19.02317' lon='84.59369' />
+ <node id='-91916' lat='19.06925' lon='84.65961' />
+ <node id='-91918' lat='19.11662' lon='84.59335' />
+ <node id='-91920' lat='19.15068' lon='84.70287' />
+ <node id='-91922' lat='19.07055' lon='84.76158' />
+ <node id='-91924' lat='18.86211' lon='85.11932' />
+ <node id='-91926' lat='13.46443' lon='80.67259' />
+ <node id='-91928' lat='13.44372' lon='80.32104' />
+ <node id='-91930' lat='13.37626' lon='80.29632' />
+ <node id='-91932' lat='13.48512' lon='80.21530' />
+ <node id='-91934' lat='13.52718' lon='80.02784' />
+ <node id='-91936' lat='13.33884' lon='79.92484' />
+ <node id='-91938' lat='13.21254' lon='79.77996' />
+ <node id='-91940' lat='13.30944' lon='79.53414' />
+ <node id='-91942' lat='13.30711' lon='79.36832' />
+ <node id='-91944' lat='13.14200' lon='79.40025' />
+ <node id='-91946' lat='13.13063' lon='79.21520' />
+ <node id='-91948' lat='13.00422' lon='79.14997' />
+ <node id='-91950' lat='13.07613' lon='78.84681' />
+ <node id='-91952' lat='12.97143' lon='78.63292' />
+ <node id='-91954' lat='12.61454' lon='78.46401' />
+ <node id='-91956' lat='12.68991' lon='78.21510' />
+ <node id='-92245' lat='11.67510' lon='80.35262' />
+ <node id='-92246' lat='11.86735' lon='79.59525' />
+ <node id='-92250' lat='12.00910' lon='80.31898' />
+ <node id='-92254' lat='10.96613' lon='80.41717' />
+ <node id='-92257' lat='10.81374' lon='79.80880' />
+ <node id='-92259' lat='10.81981' lon='80.42198' />
+ <node id='-92270' lat='11.69930' lon='75.52551' />
+ <node id='-92271' lat='11.76384' lon='75.53821' />
+ <node id='-92273' lat='11.72317' lon='75.55864' />
+ <node id='-92282' lat='16.71874' lon='82.19078' />
+ <node id='-92283' lat='16.76378' lon='82.21618' />
+ <node id='-92285' lat='16.31915' lon='83.00720' />
+ <node id='-92287' lat='16.27499' lon='82.97080' />
+ <node id='-92344' lat='12.10378' lon='79.70031' />
+ <node id='-92390' lat='10.99107' lon='79.68658' />
+ <node id='-92422' lat='11.47800' lon='75.18012' />
+ <node id='-92438' lat='11.45378' lon='75.19042' />
+ <node id='-92478' lat='11.68720' lon='75.53787' />
+ <node id='-92580' lat='32.75263' lon='78.32565' />
+ <node id='-92582' lat='32.58905' lon='77.97477' />
+ <node id='-92584' lat='32.79420' lon='77.88345' />
+ <node id='-92586' lat='32.97007' lon='77.66784' />
+ <node id='-92588' lat='32.82305' lon='77.32795' />
+ <node id='-92590' lat='33.26337' lon='76.76902' />
+ <node id='-92592' lat='33.13410' lon='76.31584' />
+ <node id='-92594' lat='32.88362' lon='75.95329' />
+ <node id='-92596' lat='32.93550' lon='75.77888' />
+ <node id='-92598' lat='32.64689' lon='75.92513' />
+ <node id='-92600' lat='32.47095' lon='75.78506' />
+ <node id='-92602' lat='32.36836' lon='75.57083' />
+ <node id='-92604' lat='32.28074' lon='75.49941' />
+ <node id='-92730' lat='31.10821' lon='78.99581' />
+ <node id='-92732' lat='31.28676' lon='78.29200' />
+ <node id='-92734' lat='31.05822' lon='77.80174' />
+ <node id='-92736' lat='30.76927' lon='77.69016' />
+ <node id='-92738' lat='30.63111' lon='77.76946' />
+ <node id='-92740' lat='30.59359' lon='77.72380' />
+ <node id='-92742' lat='30.52086' lon='77.80757' />
+ <node id='-92746' lat='30.40278' lon='77.55420' />
+ <node id='-92748' lat='30.24661' lon='77.92945' />
+ <node id='-92750' lat='29.87220' lon='77.70629' />
+ <node id='-92752' lat='29.67075' lon='77.80792' />
+ <node id='-92754' lat='29.71489' lon='77.94181' />
+ <node id='-92756' lat='29.54180' lon='77.98507' />
+ <node id='-92758' lat='29.79536' lon='78.33732' />
+ <node id='-92760' lat='29.73874' lon='78.49044' />
+ <node id='-92762' lat='29.62480' lon='78.52683' />
+ <node id='-92764' lat='29.45335' lon='78.91067' />
+ <node id='-92766' lat='29.32053' lon='78.71429' />
+ <node id='-92768' lat='29.12127' lon='79.00268' />
+ <node id='-92770' lat='29.15276' lon='79.06860' />
+ <node id='-92772' lat='28.95858' lon='79.29416' />
+ <node id='-92774' lat='28.92854' lon='79.40711' />
+ <node id='-92776' lat='28.85339' lon='79.41089' />
+ <node id='-92778' lat='28.85369' lon='79.66529' />
+ <node id='-92780' lat='28.88736' lon='79.79026' />
+ <node id='-92782' lat='28.70233' lon='79.96673' />
+ <node id='-92828' lat='27.21612' lon='88.01646' />
+ <node id='-92837' lat='20.16425' lon='72.47680' />
+ <node id='-92839' lat='20.12622' lon='72.80021' />
+ <node id='-92841' lat='20.22869' lon='72.87540' />
+ <node id='-92843' lat='20.21323' lon='72.98080' />
+ <node id='-92859' lat='20.11784' lon='72.98492' />
+ <node id='-92861' lat='20.05625' lon='73.19675' />
+ <node id='-92863' lat='20.14266' lon='73.23383' />
+ <node id='-92865' lat='20.15490' lon='73.29048' />
+ <node id='-92867' lat='20.20453' lon='73.29769' />
+ <node id='-92869' lat='20.20550' lon='73.43330' />
+ <node id='-92871' lat='20.71726' lon='73.44978' />
+ <node id='-92873' lat='20.56208' lon='73.66950' />
+ <node id='-92875' lat='20.56240' lon='73.74950' />
+ <node id='-92877' lat='20.72946' lon='73.88854' />
+ <node id='-92879' lat='20.73588' lon='73.93901' />
+ <node id='-92881' lat='20.92232' lon='73.91635' />
+ <node id='-92883' lat='21.10163' lon='73.73250' />
+ <node id='-92885' lat='21.15591' lon='73.58573' />
+ <node id='-92887' lat='21.14279' lon='73.74538' />
+ <node id='-92889' lat='21.16568' lon='73.74315' />
+ <node id='-92891' lat='21.19337' lon='73.83447' />
+ <node id='-92895' lat='21.26953' lon='73.83619' />
+ <node id='-92897' lat='21.29737' lon='73.94897' />
+ <node id='-92899' lat='21.42047' lon='74.01712' />
+ <node id='-92901' lat='21.41983' lon='74.05265' />
+ <node id='-92903' lat='21.48118' lon='74.06776' />
+ <node id='-92905' lat='21.44492' lon='74.11085' />
+ <node id='-92909' lat='21.46265' lon='74.26328' />
+ <node id='-92911' lat='21.50945' lon='74.33332' />
+ <node id='-92913' lat='21.56550' lon='74.30911' />
+ <node id='-92915' lat='21.53101' lon='74.21161' />
+ <node id='-92917' lat='21.56390' lon='74.10724' />
+ <node id='-92919' lat='21.49939' lon='73.85662' />
+ <node id='-92921' lat='21.62041' lon='73.79379' />
+ <node id='-92923' lat='21.84684' lon='73.83636' />
+ <node id='-92925' lat='21.95323' lon='74.14947' />
+ <node id='-92927' lat='22.03282' lon='74.43717' />
+ <node id='-92929' lat='21.90769' lon='74.52609' />
+ <node id='-92931' lat='21.72314' lon='74.51408' />
+ <node id='-92933' lat='21.65583' lon='74.64317' />
+ <node id='-92937' lat='21.63062' lon='74.91783' />
+ <node id='-92939' lat='21.55209' lon='75.07575' />
+ <node id='-92941' lat='21.45306' lon='75.11455' />
+ <node id='-92943' lat='21.40928' lon='75.22304' />
+ <node id='-92949' lat='21.39618' lon='75.96324' />
+ <node id='-92951' lat='21.26250' lon='76.15653' />
+ <node id='-92953' lat='21.08386' lon='76.17301' />
+ <node id='-92955' lat='21.07809' lon='76.38656' />
+ <node id='-92957' lat='21.28201' lon='76.65847' />
+ <node id='-92959' lat='21.59519' lon='76.80198' />
+ <node id='-92961' lat='21.60349' lon='76.90429' />
+ <node id='-92963' lat='21.72474' lon='77.07733' />
+ <node id='-92965' lat='21.71580' lon='77.23422' />
+ <node id='-92967' lat='21.76332' lon='77.49893' />
+ <node id='-92969' lat='21.38019' lon='77.56484' />
+ <node id='-92971' lat='21.41887' lon='78.00842' />
+ <node id='-92973' lat='21.62296' lon='78.37989' />
+ <node id='-92975' lat='21.50099' lon='78.43654' />
+ <node id='-92983' lat='21.49268' lon='78.93470' />
+ <node id='-92985' lat='21.59295' lon='78.91136' />
+ <node id='-92987' lat='21.62583' lon='79.14585' />
+ <node id='-92989' lat='21.70719' lon='79.33021' />
+ <node id='-92991' lat='21.67306' lon='79.49140' />
+ <node id='-92993' lat='21.54634' lon='79.53861' />
+ <node id='-92995' lat='21.60062' lon='79.75662' />
+ <node id='-92997' lat='21.52207' lon='79.91489' />
+ <node id='-92999' lat='21.55720' lon='79.95025' />
+ <node id='-93001' lat='21.55528' lon='80.06732' />
+ <node id='-93003' lat='21.61115' lon='80.13427' />
+ <node id='-93005' lat='21.63540' lon='80.20946' />
+ <node id='-93007' lat='21.59742' lon='80.28499' />
+ <node id='-93009' lat='21.49619' lon='80.38696' />
+ <node id='-93011' lat='21.37380' lon='80.40824' />
+ <node id='-93013' lat='21.36037' lon='80.56377' />
+ <node id='-93015' lat='21.32967' lon='80.65784' />
+ <node id='-93017' lat='21.25418' lon='80.64308' />
+ <node id='-93019' lat='21.09923' lon='80.42129' />
+ <node id='-93021' lat='20.92681' lon='80.46935' />
+ <node id='-93023' lat='20.92681' lon='80.54214' />
+ <node id='-93025' lat='20.66940' lon='80.57990' />
+ <node id='-93027' lat='20.32273' lon='80.60806' />
+ <node id='-93029' lat='20.23256' lon='80.38284' />
+ <node id='-93031' lat='20.07528' lon='80.54488' />
+ <node id='-93033' lat='19.92687' lon='80.51467' />
+ <node id='-93035' lat='19.47306' lon='80.89370' />
+ <node id='-93037' lat='19.27355' lon='80.72341' />
+ <node id='-93039' lat='19.40313' lon='80.55587' />
+ <node id='-93041' lat='18.95565' lon='80.24825' />
+ <node id='-93043' lat='18.83091' lon='80.36636' />
+ <node id='-93205' lat='11.88348' lon='71.96044' />
+ <node id='-93206' lat='11.89423' lon='74.10827' />
+ <node id='-93225' lat='10.83331' lon='91.66991' />
+ <node id='-93266' lat='17.88727' lon='81.40165' />
+ <node id='-93268' lat='17.89707' lon='81.44988' />
+ <node id='-93270' lat='18.16248' lon='81.52679' />
+ <node id='-93272' lat='18.19217' lon='81.50722' />
+ <node id='-93274' lat='18.26864' lon='81.54275' />
+ <node id='-93276' lat='18.31052' lon='81.61468' />
+ <node id='-93278' lat='18.39916' lon='81.70600' />
+ <node id='-93280' lat='18.42196' lon='81.69158' />
+ <node id='-93282' lat='18.47700' lon='81.79664' />
+ <node id='-93284' lat='18.57140' lon='81.84402' />
+ <node id='-93286' lat='18.64266' lon='81.90101' />
+ <node id='-93288' lat='18.79094' lon='82.16468' />
+ <node id='-93290' lat='18.90401' lon='82.17945' />
+ <node id='-93292' lat='18.91473' lon='82.25120' />
+ <node id='-93294' lat='19.78221' lon='82.06375' />
+ <node id='-93296' lat='19.92558' lon='81.82617' />
+ <node id='-93298' lat='20.09527' lon='81.93809' />
+ <node id='-93300' lat='19.83776' lon='82.34939' />
+ <node id='-93302' lat='19.91461' lon='82.45513' />
+ <node id='-93304' lat='19.86263' lon='82.58628' />
+ <node id='-93306' lat='19.76444' lon='82.58285' />
+ <node id='-93308' lat='19.85036' lon='82.72258' />
+ <node id='-93310' lat='20.00141' lon='82.70439' />
+ <node id='-93312' lat='20.05302' lon='82.39437' />
+ <node id='-93314' lat='20.85688' lon='82.34252' />
+ <node id='-93316' lat='20.82608' lon='82.45170' />
+ <node id='-93318' lat='21.16008' lon='82.67555' />
+ <node id='-93320' lat='21.11044' lon='83.17920' />
+ <node id='-93322' lat='21.37220' lon='83.27499' />
+ <node id='-93324' lat='21.33958' lon='83.40236' />
+ <node id='-93326' lat='21.50226' lon='83.33850' />
+ <node id='-93328' lat='21.72569' lon='83.46828' />
+ <node id='-93330' lat='21.81242' lon='83.48167' />
+ <node id='-93332' lat='21.84078' lon='83.58844' />
+ <node id='-93334' lat='22.05159' lon='83.54347' />
+ <node id='-93336' lat='22.22967' lon='83.65436' />
+ <node id='-93338' lat='22.37261' lon='84.00421' />
+ <node id='-93340' lat='22.46005' lon='84.04129' />
+ <node id='-93342' lat='22.53602' lon='83.99425' />
+ <node id='-93344' lat='22.89325' lon='84.40177' />
+ <node id='-93346' lat='22.97704' lon='84.36950' />
+ <node id='-93348' lat='22.97546' lon='84.14909' />
+ <node id='-93350' lat='23.16592' lon='84.02961' />
+ <node id='-93352' lat='23.33059' lon='84.06978' />
+ <node id='-93354' lat='23.37424' lon='83.97039' />
+ <node id='-93356' lat='23.63068' lon='84.02652' />
+ <node id='-93358' lat='23.58853' lon='83.78929' />
+ <node id='-93360' lat='23.68587' lon='83.71564' />
+ <node id='-93362' lat='23.82209' lon='83.69487' />
+ <node id='-93364' lat='23.87830' lon='83.55342' />
+ <node id='-93366' lat='24.08596' lon='83.41850' />
+ <node id='-93368' lat='24.10131' lon='83.32134' />
+ <node id='-93370' lat='23.90467' lon='83.15963' />
+ <node id='-93372' lat='23.87642' lon='82.95226' />
+ <node id='-93374' lat='23.96492' lon='82.80876' />
+ <node id='-93376' lat='23.90216' lon='82.65666' />
+ <node id='-93378' lat='23.78440' lon='82.49599' />
+ <node id='-93380' lat='23.85569' lon='81.90685' />
+ <node id='-93382' lat='23.80764' lon='81.79218' />
+ <node id='-93384' lat='23.83999' lon='81.72214' />
+ <node id='-93386' lat='23.92821' lon='81.66274' />
+ <node id='-93388' lat='23.88834' lon='81.59614' />
+ <node id='-93390' lat='23.71809' lon='81.68712' />
+ <node id='-93392' lat='23.58113' lon='81.57091' />
+ <node id='-93394' lat='23.48875' lon='81.62567' />
+ <node id='-93396' lat='23.56619' lon='81.75338' />
+ <node id='-93398' lat='23.49347' lon='81.94942' />
+ <node id='-93400' lat='23.38433' lon='82.03886' />
+ <node id='-93402' lat='23.32066' lon='82.19361' />
+ <node id='-93404' lat='23.16608' lon='82.13687' />
+ <node id='-93406' lat='23.15077' lon='82.16245' />
+ <node id='-93408' lat='23.10247' lon='82.11490' />
+ <node id='-93410' lat='23.07823' lon='81.93886' />
+ <node id='-93412' lat='22.94701' lon='81.91543' />
+ <node id='-93414' lat='22.85086' lon='81.75991' />
+ <node id='-93416' lat='22.65108' lon='81.76849' />
+ <node id='-93418' lat='22.45291' lon='81.39633' />
+ <node id='-93420' lat='22.52175' lon='81.35684' />
+ <node id='-93422' lat='22.43102' lon='81.09180' />
+ <node id='-93424' lat='22.03441' lon='80.98571' />
+ <node id='-93426' lat='22.13112' lon='80.90606' />
+ <node id='-93428' lat='21.74036' lon='80.80203' />
+ <node id='-93661' lat='20.78694' lon='87.74779' />
+ <node id='-93663' lat='21.76045' lon='87.43709' />
+ <node id='-93665' lat='21.81114' lon='87.27264' />
+ <node id='-93667' lat='21.96024' lon='87.22457' />
+ <node id='-93669' lat='21.85066' lon='87.05635' />
+ <node id='-93671' lat='22.08627' lon='86.94992' />
+ <node id='-93673' lat='22.14480' lon='86.71371' />
+ <node id='-93675' lat='22.21569' lon='86.72470' />
+ <node id='-93677' lat='22.56012' lon='86.03324' />
+ <node id='-93679' lat='22.48242' lon='85.96115' />
+ <node id='-93681' lat='22.30434' lon='86.01779' />
+ <node id='-93683' lat='21.95801' lon='85.90587' />
+ <node id='-93695' lat='22.15783' lon='85.38986' />
+ <node id='-93697' lat='22.00003' lon='85.22952' />
+ <node id='-93699' lat='22.10886' lon='85.01426' />
+ <node id='-93701' lat='22.31800' lon='85.10662' />
+ <node id='-93703' lat='22.48083' lon='85.05958' />
+ <node id='-93705' lat='22.40785' lon='84.48760' />
+ <node id='-93707' lat='22.32467' lon='84.27955' />
+ <node id='-94051' lat='26.26755' lon='89.71298' />
+ <node id='-94053' lat='26.40078' lon='89.84653' />
+ <node id='-94055' lat='26.46258' lon='89.86885' />
+ <node id='-94057' lat='26.73307' lon='89.86124' />
+ <node id='-94074' lat='27.17310' lon='88.62842' />
+ <node id='-94076' lat='27.17753' lon='88.52045' />
+ <node id='-94078' lat='27.07655' lon='88.45161' />
+ <node id='-94080' lat='27.10176' lon='88.33505' />
+ <node id='-94082' lat='27.12682' lon='88.30226' />
+ <node id='-94084' lat='27.11842' lon='88.22656' />
+ <node id='-94086' lat='27.14072' lon='88.08563' />
+ <node id='-94088' lat='27.16501' lon='88.08331' />
+ <node id='-94090' lat='27.21631' lon='88.04932' />
+ <node id='-94092' lat='27.21388' lon='88.01587' />
+ <node id='-94104' lat='26.51097' lon='88.14313' />
+ <node id='-94106' lat='26.55413' lon='88.23394' />
+ <node id='-94108' lat='26.47549' lon='88.19137' />
+ <node id='-94110' lat='26.42630' lon='88.26158' />
+ <node id='-94112' lat='26.37679' lon='88.23034' />
+ <node id='-94114' lat='26.35680' lon='88.29093' />
+ <node id='-94116' lat='26.14341' lon='88.00460' />
+ <node id='-94118' lat='26.06511' lon='87.95036' />
+ <node id='-94120' lat='26.04537' lon='87.84393' />
+ <node id='-94122' lat='25.87559' lon='87.78625' />
+ <node id='-94124' lat='25.85304' lon='87.90058' />
+ <node id='-94126' lat='25.76866' lon='87.89989' />
+ <node id='-94128' lat='25.68794' lon='88.04923' />
+ <node id='-94130' lat='25.54182' lon='88.03859' />
+ <node id='-94132' lat='25.48047' lon='88.06880' />
+ <node id='-94134' lat='25.53717' lon='87.92667' />
+ <node id='-94136' lat='25.42529' lon='87.76514' />
+ <node id='-94138' lat='25.34495' lon='87.78865' />
+ <node id='-94140' lat='25.27139' lon='87.86521' />
+ <node id='-94142' lat='25.15212' lon='87.78831' />
+ <node id='-94144' lat='24.97174' lon='87.95173' />
+ <node id='-94146' lat='24.73810' lon='87.83431' />
+ <node id='-94148' lat='24.57616' lon='87.89543' />
+ <node id='-94150' lat='24.57147' lon='87.77904' />
+ <node id='-94152' lat='24.34928' lon='87.78110' />
+ <node id='-94154' lat='24.21628' lon='87.63587' />
+ <node id='-94156' lat='24.14048' lon='87.71038' />
+ <node id='-94160' lat='23.97527' lon='87.44430' />
+ <node id='-94162' lat='24.04238' lon='87.23281' />
+ <node id='-94164' lat='23.87516' lon='87.27933' />
+ <node id='-94166' lat='23.80639' lon='87.08312' />
+ <node id='-94168' lat='23.89054' lon='86.89704' />
+ <node id='-94170' lat='23.82806' lon='86.79748' />
+ <node id='-94172' lat='23.76115' lon='86.81980' />
+ <node id='-94176' lat='23.68351' lon='86.79508' />
+ <node id='-94178' lat='23.68194' lon='86.73740' />
+ <node id='-94180' lat='23.67156' lon='86.59286' />
+ <node id='-94182' lat='23.62628' lon='86.52420' />
+ <node id='-94184' lat='23.62816' lon='86.44214' />
+ <node id='-94188' lat='23.42544' lon='86.31374' />
+ <node id='-94190' lat='23.47647' lon='86.14208' />
+ <node id='-94192' lat='23.56619' lon='86.14311' />
+ <node id='-94194' lat='23.56619' lon='86.01230' />
+ <node id='-94196' lat='23.48245' lon='86.04389' />
+ <node id='-94198' lat='23.47489' lon='85.87223' />
+ <node id='-94200' lat='23.41316' lon='85.86330' />
+ <node id='-94202' lat='23.37062' lon='85.89969' />
+ <node id='-94204' lat='23.26784' lon='85.82279' />
+ <node id='-94206' lat='23.12236' lon='85.92269' />
+ <node id='-94208' lat='23.14572' lon='86.04423' />
+ <node id='-94210' lat='22.98747' lon='86.21761' />
+ <node id='-94212' lat='22.97641' lon='86.54720' />
+ <node id='-94216' lat='22.77586' lon='86.42188' />
+ <node id='-94222' lat='22.56487' lon='86.78031' />
+ <node id='-94230' lat='22.24715' lon='86.88812' />
+ <node id='-94588' lat='24.26793' lon='83.40270' />
+ <node id='-94590' lat='24.31550' lon='83.37387' />
+ <node id='-94592' lat='24.36992' lon='83.46347' />
+ <node id='-94594' lat='24.50027' lon='83.39275' />
+ <node id='-94596' lat='24.52651' lon='83.49883' />
+ <node id='-94598' lat='24.73747' lon='83.50330' />
+ <node id='-94600' lat='24.78735' lon='83.39824' />
+ <node id='-94602' lat='25.01250' lon='83.34125' />
+ <node id='-94604' lat='25.17744' lon='83.34897' />
+ <node id='-94612' lat='25.24966' lon='83.41335' />
+ <node id='-94618' lat='25.25152' lon='83.46210' />
+ <node id='-94620' lat='25.28614' lon='83.49077' />
+ <node id='-94622' lat='25.34464' lon='83.64852' />
+ <node id='-94624' lat='25.36745' lon='83.65917' />
+ <node id='-94626' lat='25.40792' lon='83.74242' />
+ <node id='-94628' lat='25.38590' lon='83.76422' />
+ <node id='-94630' lat='25.43645' lon='83.84593' />
+ <node id='-94632' lat='25.45459' lon='83.81452' />
+ <node id='-94634' lat='25.49333' lon='83.87100' />
+ <node id='-94636' lat='25.51765' lon='83.88061' />
+ <node id='-94638' lat='25.64833' lon='84.05845' />
+ <node id='-94640' lat='25.72908' lon='84.09210' />
+ <node id='-94642' lat='25.70588' lon='84.32899' />
+ <node id='-94644' lat='25.76959' lon='84.38804' />
+ <node id='-94646' lat='25.68485' lon='84.47490' />
+ <node id='-94648' lat='25.74022' lon='84.66613' />
+ <node id='-94650' lat='25.85737' lon='84.54082' />
+ <node id='-94652' lat='25.94538' lon='84.27955' />
+ <node id='-94654' lat='26.03334' lon='84.15183' />
+ <node id='-94656' lat='26.13848' lon='84.02309' />
+ <node id='-94658' lat='26.23676' lon='84.01245' />
+ <node id='-94660' lat='26.26139' lon='84.17106' />
+ <node id='-94662' lat='26.37495' lon='84.17243' />
+ <node id='-94664' lat='26.44905' lon='83.90258' />
+ <node id='-94666' lat='26.52250' lon='83.87992' />
+ <node id='-94668' lat='26.54891' lon='84.05296' />
+ <node id='-94670' lat='26.63180' lon='84.12540' />
+ <node id='-94672' lat='26.61554' lon='84.39594' />
+ <node id='-94674' lat='26.75082' lon='84.30599' />
+ <node id='-94678' lat='26.86511' lon='84.23973' />
+ <node id='-94686' lat='27.08847' lon='84.02687' />
+ <node id='-94688' lat='27.29552' lon='83.83048' />
+ <node id='-94746' lat='30.31006' lon='77.58613' />
+ <node id='-94748' lat='30.06315' lon='77.34443' />
+ <node id='-94750' lat='29.75305' lon='77.12882' />
+ <node id='-94752' lat='29.50415' lon='77.10411' />
+ <node id='-94754' lat='29.09577' lon='77.14187' />
+ <node id='-94756' lat='28.89939' lon='77.22358' />
+ <node id='-94758' lat='28.85730' lon='77.21157' />
+ <node id='-94760' lat='28.82091' lon='77.22290' />
+ <node id='-94762' lat='28.80527' lon='77.20418' />
+ <node id='-94764' lat='28.78451' lon='77.20659' />
+ <node id='-94766' lat='28.75908' lon='77.23839' />
+ <node id='-94768' lat='28.75580' lon='77.25512' />
+ <node id='-94770' lat='28.73564' lon='77.26057' />
+ <node id='-94772' lat='28.73564' lon='77.27667' />
+ <node id='-94774' lat='28.72480' lon='77.28688' />
+ <node id='-94776' lat='28.70602' lon='77.29036' />
+ <node id='-94778' lat='28.70526' lon='77.29628' />
+ <node id='-94780' lat='28.71008' lon='77.29971' />
+ <node id='-94782' lat='28.71317' lon='77.33207' />
+ <node id='-94784' lat='28.69864' lon='77.32409' />
+ <node id='-94786' lat='28.68147' lon='77.33345' />
+ <node id='-94788' lat='28.67827' lon='77.32551' />
+ <node id='-94790' lat='28.66234' lon='77.32027' />
+ <node id='-94792' lat='28.65188' lon='77.31988' />
+ <node id='-94794' lat='28.64152' lon='77.31594' />
+ <node id='-94796' lat='28.62299' lon='77.34087' />
+ <node id='-94798' lat='28.60524' lon='77.34190' />
+ <node id='-94800' lat='28.60174' lon='77.33645' />
+ <node id='-94802' lat='28.59789' lon='77.32460' />
+ <node id='-94804' lat='28.59661' lon='77.31332' />
+ <node id='-94806' lat='28.58587' lon='77.30422' />
+ <node id='-94808' lat='28.58772' lon='77.29916' />
+ <node id='-94810' lat='28.57634' lon='77.29293' />
+ <node id='-94812' lat='28.55723' lon='77.29886' />
+ <node id='-94814' lat='28.51651' lon='77.34615' />
+ <node id='-94816' lat='28.47035' lon='77.37447' />
+ <node id='-94818' lat='28.47465' lon='77.41447' />
+ <node id='-94820' lat='28.44039' lon='77.41584' />
+ <node id='-94835' lat='28.46506' lon='77.38752' />
+ <node id='-94853' lat='28.81429' lon='77.20985' />
+ <node id='-94881' lat='28.75524' lon='77.24886' />
+ <node id='-94913' lat='28.75039' lon='77.26006' />
+ <node id='-94933' lat='28.73861' lon='77.25547' />
+ <node id='-94957' lat='28.74440' lon='77.25658' />
+ <node id='-94977' lat='28.72273' lon='77.29083' />
+ <node id='-94987' lat='28.71430' lon='77.28650' />
+ <node id='-95002' lat='28.71366' lon='77.31340' />
+ <node id='-95046' lat='28.67861' lon='77.32997' />
+ <node id='-95078' lat='28.60098' lon='77.33066' />
+ <node id='-95119' lat='28.59085' lon='77.31049' />
+ <node id='-95144' lat='28.46122' lon='77.42477' />
+ <node id='-95147' lat='28.42590' lon='77.43086' />
+ <node id='-95149' lat='28.43586' lon='77.45704' />
+ <node id='-95151' lat='28.41918' lon='77.47361' />
+ <node id='-95153' lat='28.39970' lon='77.46811' />
+ <node id='-95155' lat='28.40891' lon='77.49790' />
+ <node id='-95157' lat='28.35515' lon='77.48828' />
+ <node id='-95159' lat='28.30831' lon='77.46528' />
+ <node id='-95161' lat='28.23725' lon='77.53532' />
+ <node id='-95163' lat='28.19792' lon='77.48794' />
+ <node id='-95165' lat='28.17613' lon='77.54699' />
+ <node id='-95167' lat='28.08409' lon='77.47283' />
+ <node id='-95169' lat='27.99167' lon='77.53635' />
+ <node id='-95171' lat='27.92040' lon='77.52468' />
+ <node id='-95179' lat='27.80689' lon='77.28126' />
+ <node id='-95183' lat='27.39310' lon='77.44331' />
+ <node id='-95185' lat='27.24303' lon='77.64930' />
+ <node id='-95187' lat='27.17341' lon='77.67127' />
+ <node id='-95189' lat='27.08297' lon='77.49412' />
+ <node id='-95191' lat='27.00469' lon='77.75848' />
+ <node id='-95193' lat='26.85776' lon='77.41722' />
+ <node id='-95195' lat='26.74315' lon='77.45704' />
+ <node id='-95197' lat='26.92819' lon='77.78045' />
+ <node id='-95199' lat='26.87001' lon='78.04275' />
+ <node id='-95201' lat='26.94961' lon='78.14575' />
+ <node id='-95203' lat='26.92941' lon='78.26042' />
+ <node id='-95205' lat='26.82407' lon='78.21029' />
+ <node id='-95207' lat='26.77994' lon='78.74999' />
+ <node id='-95209' lat='26.63518' lon='79.01779' />
+ <node id='-95211' lat='26.32665' lon='79.12902' />
+ <node id='-95213' lat='25.90864' lon='78.88458' />
+ <node id='-95215' lat='25.73589' lon='78.74914' />
+ <node id='-95217' lat='25.63750' lon='78.82003' />
+ <node id='-95219' lat='25.57031' lon='78.52752' />
+ <node id='-95221' lat='25.56133' lon='78.44066' />
+ <node id='-95223' lat='25.37070' lon='78.30642' />
+ <node id='-95225' lat='25.12787' lon='78.44306' />
+ <node id='-95227' lat='25.08155' lon='78.34178' />
+ <node id='-95229' lat='24.97454' lon='78.30642' />
+ <node id='-95231' lat='24.87647' lon='78.16635' />
+ <node id='-95233' lat='24.56710' lon='78.28033' />
+ <node id='-95235' lat='24.45277' lon='78.26660' />
+ <node id='-95237' lat='24.26511' lon='78.38882' />
+ <node id='-95239' lat='24.39025' lon='78.51516' />
+ <node id='-95241' lat='24.15677' lon='78.80767' />
+ <node id='-95243' lat='24.35397' lon='78.97590' />
+ <node id='-95245' lat='24.44527' lon='78.98483' />
+ <node id='-95247' lat='24.64483' lon='78.87634' />
+ <node id='-95249' lat='24.60519' lon='78.75686' />
+ <node id='-95251' lat='24.86027' lon='78.77471' />
+ <node id='-95253' lat='24.91197' lon='78.65558' />
+ <node id='-95255' lat='25.08870' lon='78.63395' />
+ <node id='-95257' lat='25.26984' lon='78.55464' />
+ <node id='-95259' lat='25.28164' lon='78.42109' />
+ <node id='-95261' lat='25.31330' lon='78.54640' />
+ <node id='-95263' lat='25.36419' lon='78.52306' />
+ <node id='-95265' lat='25.34961' lon='78.57868' />
+ <node id='-95267' lat='25.39676' lon='78.56975' />
+ <node id='-95269' lat='25.45102' lon='78.71051' />
+ <node id='-95271' lat='25.38807' lon='78.66588' />
+ <node id='-95273' lat='25.33968' lon='78.75789' />
+ <node id='-95275' lat='25.43056' lon='78.81214' />
+ <node id='-95277' lat='25.47086' lon='78.73146' />
+ <node id='-95279' lat='25.56753' lon='78.92681' />
+ <node id='-95281' lat='25.14590' lon='79.04182' />
+ <node id='-95283' lat='25.14404' lon='79.31373' />
+ <node id='-95285' lat='25.35395' lon='79.27940' />
+ <node id='-95287' lat='25.27512' lon='79.47303' />
+ <node id='-95289' lat='25.11731' lon='79.39269' />
+ <node id='-95291' lat='25.10860' lon='79.86442' />
+ <node id='-95293' lat='25.23786' lon='79.86854' />
+ <node id='-95295' lat='25.42281' lon='80.29014' />
+ <node id='-95297' lat='25.16330' lon='80.41648' />
+ <node id='-95299' lat='25.02401' lon='80.25649' />
+ <node id='-95301' lat='25.10425' lon='80.61561' />
+ <node id='-95303' lat='25.05823' lon='80.77972' />
+ <node id='-95305' lat='25.14342' lon='80.71723' />
+ <node id='-95307' lat='25.19375' lon='80.88958' />
+ <node id='-95309' lat='24.99788' lon='80.84426' />
+ <node id='-95311' lat='24.94154' lon='80.80375' />
+ <node id='-95313' lat='24.95431' lon='81.22741' />
+ <node id='-95315' lat='25.16703' lon='81.27822' />
+ <node id='-95317' lat='25.07938' lon='81.49040' />
+ <node id='-95319' lat='25.19748' lon='81.56112' />
+ <node id='-95321' lat='25.03863' lon='81.69605' />
+ <node id='-95323' lat='25.05574' lon='81.73587' />
+ <node id='-95325' lat='25.00783' lon='81.79389' />
+ <node id='-95327' lat='24.99943' lon='81.90376' />
+ <node id='-95329' lat='24.88768' lon='81.90101' />
+ <node id='-95331' lat='24.83301' lon='81.95869' />
+ <node id='-95333' lat='24.78392' lon='82.20691' />
+ <node id='-95335' lat='24.60831' lon='82.30854' />
+ <node id='-95337' lat='24.59458' lon='82.42561' />
+ <node id='-95339' lat='24.70504' lon='82.41634' />
+ <node id='-95341' lat='24.65575' lon='82.55195' />
+ <node id='-95343' lat='24.69755' lon='82.69374' />
+ <node id='-95345' lat='24.55274' lon='82.80361' />
+ <node id='-95347' lat='24.52713' lon='82.71846' />
+ <node id='-95349' lat='24.37305' lon='82.71606' />
+ <node id='-95351' lat='24.37540' lon='82.76618' />
+ <node id='-95353' lat='24.29312' lon='82.77854' />
+ <node id='-95355' lat='24.13876' lon='82.71915' />
+ <node id='-95357' lat='24.16695' lon='82.67520' />
+ <node id='-95359' lat='24.12513' lon='82.66216' />
+ <node id='-95361' lat='24.09693' lon='82.70267' />
+ <node id='-95363' lat='24.00319' lon='82.79708' />
+ <node id='-95718' lat='24.50245' lon='83.75015' />
+ <node id='-95720' lat='24.54899' lon='83.94584' />
+ <node id='-95722' lat='24.63141' lon='83.99940' />
+ <node id='-95730' lat='24.28546' lon='84.49756' />
+ <node id='-95732' lat='24.41151' lon='84.57447' />
+ <node id='-95738' lat='24.52900' lon='84.81994' />
+ <node id='-95744' lat='24.36304' lon='84.89307' />
+ <node id='-95746' lat='24.61518' lon='85.66108' />
+ <node id='-95748' lat='24.81540' lon='85.73730' />
+ <node id='-95750' lat='24.71876' lon='86.12869' />
+ <node id='-95752' lat='24.61143' lon='86.12491' />
+ <node id='-95754' lat='24.58240' lon='86.32163' />
+ <node id='-95756' lat='24.46027' lon='86.28833' />
+ <node id='-95758' lat='24.36586' lon='86.45004' />
+ <node id='-95760' lat='24.60457' lon='86.60316' />
+ <node id='-95770' lat='24.61237' lon='87.05532' />
+ <node id='-95772' lat='24.84812' lon='87.10235' />
+ <node id='-95774' lat='24.89391' lon='87.15866' />
+ <node id='-95776' lat='25.02246' lon='87.15110' />
+ <node id='-95778' lat='25.09243' lon='87.21668' />
+ <node id='-95780' lat='25.09741' lon='87.28946' />
+ <node id='-95782' lat='25.22016' lon='87.32688' />
+ <node id='-95784' lat='25.19686' lon='87.47348' />
+ <node id='-95786' lat='25.29933' lon='87.48962' />
+ <node id='-95788' lat='25.27947' lon='87.53906' />
+ <node id='-95790' lat='25.35271' lon='87.58369' />
+ <node id='-95792' lat='25.28009' lon='87.65373' />
+ <node id='-96080' lat='20.48555' lon='72.83901' />
+ <node id='-96081' lat='20.43087' lon='72.90801' />
+ <node id='-96083' lat='20.36748' lon='72.89291' />
+ <node id='-96091' lat='20.73203' lon='70.87331' />
+ <node id='-96092' lat='20.44438' lon='70.84670' />
+ <node id='-96096' lat='20.74648' lon='71.00154' />
+ <node id='-96157' lat='21.42207' lon='68.83233' />
+ <node id='-96189' lat='24.60894' lon='72.18292' />
+ <node id='-96195' lat='24.49214' lon='72.44144' />
+ <node id='-96197' lat='24.40088' lon='72.50083' />
+ <node id='-96199' lat='24.44527' lon='72.69996' />
+ <node id='-96201' lat='24.35491' lon='72.74116' />
+ <node id='-96203' lat='24.34866' lon='72.97084' />
+ <node id='-96205' lat='24.48777' lon='73.00277' />
+ <node id='-96211' lat='24.36476' lon='73.23280' />
+ <node id='-96213' lat='24.20829' lon='73.07830' />
+ <node id='-96217' lat='24.00319' lon='73.24310' />
+ <node id='-96219' lat='24.13359' lon='73.37425' />
+ <node id='-96221' lat='23.92601' lon='73.42231' />
+ <node id='-96223' lat='23.77591' lon='73.35639' />
+ <node id='-96229' lat='23.66024' lon='73.62110' />
+ <node id='-96231' lat='23.43930' lon='73.64135' />
+ <node id='-96239' lat='23.44749' lon='73.83172' />
+ <node id='-96241' lat='23.33248' lon='73.89953' />
+ <node id='-96245' lat='23.33405' lon='73.99017' />
+ <node id='-96253' lat='23.19244' lon='74.24182' />
+ <node id='-96255' lat='23.05730' lon='74.32010' />
+ <node id='-96257' lat='22.86004' lon='74.47769' />
+ <node id='-96259' lat='22.62858' lon='74.36714' />
+ <node id='-96261' lat='22.64633' lon='74.26929' />
+ <node id='-96265' lat='22.48115' lon='74.05677' />
+ <node id='-96271' lat='22.38373' lon='74.27787' />
+ <node id='-96273' lat='22.35896' lon='74.08149' />
+ <node id='-96275' lat='22.24652' lon='74.07909' />
+ <node id='-96277' lat='22.06846' lon='74.17282' />
+ <node id='-96326' lat='20.19744' lon='73.17100' />
+ <node id='-96328' lat='20.18487' lon='73.06354' />
+ <node id='-96330' lat='20.21806' lon='73.06766' />
+ <node id='-96332' lat='20.29407' lon='73.18508' />
+ <node id='-96334' lat='20.36909' lon='73.12156' />
+ <node id='-96336' lat='20.35331' lon='72.94578' />
+ <node id='-96338' lat='20.26348' lon='72.92346' />
+ <node id='-96344' lat='20.38318' lon='72.47526' />
+ <node id='-96388' lat='23.11004' lon='74.39769' />
+ <node id='-96390' lat='23.09868' lon='74.53502' />
+ <node id='-96392' lat='23.22841' lon='74.75063' />
+ <node id='-96394' lat='23.27572' lon='74.69707' />
+ <node id='-96396' lat='23.30095' lon='74.53605' />
+ <node id='-96398' lat='23.45694' lon='74.61124' />
+ <node id='-96400' lat='23.54321' lon='74.78702' />
+ <node id='-96402' lat='23.63760' lon='74.93877' />
+ <node id='-96404' lat='23.86166' lon='74.90924' />
+ <node id='-96406' lat='24.03235' lon='74.98958' />
+ <node id='-96408' lat='24.21816' lon='74.88143' />
+ <node id='-96410' lat='24.24226' lon='74.91371' />
+ <node id='-96412' lat='24.27607' lon='74.87182' />
+ <node id='-96414' lat='24.27576' lon='74.75269' />
+ <node id='-96416' lat='24.41714' lon='74.81002' />
+ <node id='-96418' lat='24.46058' lon='74.90375' />
+ <node id='-96420' lat='24.48996' lon='74.86907' />
+ <node id='-96424' lat='24.53900' lon='74.74616' />
+ <node id='-96426' lat='24.67322' lon='74.80659' />
+ <node id='-96428' lat='24.79483' lon='74.80522' />
+ <node id='-96430' lat='24.65107' lon='74.90066' />
+ <node id='-96432' lat='24.75431' lon='75.03318' />
+ <node id='-96434' lat='24.81135' lon='74.84607' />
+ <node id='-96436' lat='24.98294' lon='74.83543' />
+ <node id='-96438' lat='24.84563' lon='75.03078' />
+ <node id='-96440' lat='24.88986' lon='75.11352' />
+ <node id='-96442' lat='25.05356' lon='75.17291' />
+ <node id='-96444' lat='25.03397' lon='75.35659' />
+ <node id='-96450' lat='24.90138' lon='75.30715' />
+ <node id='-96452' lat='24.88550' lon='75.42629' />
+ <node id='-96460' lat='24.75057' lon='75.18527' />
+ <node id='-96462' lat='24.68944' lon='75.46989' />
+ <node id='-96464' lat='24.72562' lon='75.58593' />
+ <node id='-96466' lat='24.68632' lon='75.62919' />
+ <node id='-96468' lat='24.76990' lon='75.78712' />
+ <node id='-96470' lat='24.51838' lon='75.92101' />
+ <node id='-96472' lat='24.42401' lon='75.88737' />
+ <node id='-96474' lat='24.47183' lon='75.78987' />
+ <node id='-96476' lat='24.38118' lon='75.73081' />
+ <node id='-96478' lat='24.24727' lon='75.82076' />
+ <node id='-96480' lat='24.13766' lon='75.74180' />
+ <node id='-96482' lat='24.10257' lon='75.84377' />
+ <node id='-96484' lat='23.96617' lon='75.70953' />
+ <node id='-96490' lat='24.06590' lon='75.53203' />
+ <node id='-96494' lat='23.91440' lon='75.45993' />
+ <node id='-96500' lat='23.76020' lon='75.68790' />
+ <node id='-96504' lat='23.89651' lon='75.73596' />
+ <node id='-96506' lat='23.88489' lon='75.87879' />
+ <node id='-96508' lat='23.93574' lon='75.98384' />
+ <node id='-96510' lat='24.02357' lon='75.96324' />
+ <node id='-96512' lat='24.08564' lon='76.08890' />
+ <node id='-96516' lat='24.33364' lon='76.18846' />
+ <node id='-96518' lat='24.21283' lon='76.21215' />
+ <node id='-96520' lat='24.25103' lon='76.35875' />
+ <node id='-96532' lat='24.13735' lon='76.91768' />
+ <node id='-96534' lat='24.20751' lon='76.94343' />
+ <node id='-96536' lat='24.37180' lon='76.83494' />
+ <node id='-96538' lat='24.54400' lon='76.82224' />
+ <node id='-96540' lat='24.54181' lon='76.91802' />
+ <node id='-96542' lat='24.45090' lon='76.94789' />
+ <node id='-96544' lat='24.52838' lon='77.05879' />
+ <node id='-96546' lat='24.64639' lon='77.06737' />
+ <node id='-96548' lat='24.75805' lon='76.95304' />
+ <node id='-96550' lat='24.74745' lon='76.85211' />
+ <node id='-96552' lat='24.83098' lon='76.78481' />
+ <node id='-96554' lat='24.86401' lon='76.94274' />
+ <node id='-96556' lat='25.03646' lon='76.85554' />
+ <node id='-96558' lat='25.07316' lon='77.00248' />
+ <node id='-96560' lat='25.11482' lon='77.27439' />
+ <node id='-96562' lat='25.07938' lon='77.31044' />
+ <node id='-96564' lat='25.11979' lon='77.39559' />
+ <node id='-96566' lat='25.22109' lon='77.41069' />
+ <node id='-96568' lat='25.27760' lon='77.35507' />
+ <node id='-96570' lat='25.42932' lon='77.35645' />
+ <node id='-96572' lat='25.42746' lon='77.27508' />
+ <node id='-96574' lat='25.30647' lon='77.19646' />
+ <node id='-96576' lat='25.33813' lon='77.07630' />
+ <node id='-96578' lat='25.28071' lon='76.93691' />
+ <node id='-96580' lat='25.32944' lon='76.83734' />
+ <node id='-96582' lat='25.34309' lon='76.68079' />
+ <node id='-96584' lat='25.39304' lon='76.59942' />
+ <node id='-96586' lat='25.53190' lon='76.52046' />
+ <node id='-96588' lat='25.71795' lon='76.48544' />
+ <node id='-96590' lat='25.87745' lon='76.59187' />
+ <node id='-96592' lat='25.94353' lon='76.79408' />
+ <node id='-96594' lat='26.09533' lon='76.91493' />
+ <node id='-96805' lat='30.06196' lon='73.92219' />
+ <node id='-96807' lat='29.96921' lon='73.88992' />
+ <node id='-96809' lat='29.94303' lon='74.52094' />
+ <node id='-96811' lat='29.85553' lon='74.55116' />
+ <node id='-96813' lat='29.78106' lon='74.46464' />
+ <node id='-96815' lat='29.74053' lon='74.50035' />
+ <node id='-96817' lat='29.76199' lon='74.61158' />
+ <node id='-96819' lat='29.56449' lon='74.57244' />
+ <node id='-96821' lat='29.52985' lon='74.62188' />
+ <node id='-96823' lat='29.45992' lon='74.57382' />
+ <node id='-96825' lat='29.32472' lon='74.59785' />
+ <node id='-96833' lat='29.39563' lon='74.80453' />
+ <node id='-96839' lat='29.28100' lon='75.05207' />
+ <node id='-96841' lat='29.22889' lon='75.08159' />
+ <node id='-96845' lat='29.28909' lon='75.33462' />
+ <node id='-96847' lat='29.19982' lon='75.41084' />
+ <node id='-96849' lat='29.14301' lon='75.36294' />
+ <node id='-96853' lat='29.01609' lon='75.44448' />
+ <node id='-96855' lat='29.01504' lon='75.51315' />
+ <node id='-96857' lat='28.97330' lon='75.51744' />
+ <node id='-96859' lat='28.92689' lon='75.46560' />
+ <node id='-96861' lat='28.61225' lon='75.56877' />
+ <node id='-96863' lat='28.40227' lon='75.80223' />
+ <node id='-96865' lat='28.36663' lon='75.94333' />
+ <node id='-96873' lat='28.14980' lon='76.09336' />
+ <node id='-96875' lat='28.16948' lon='76.01886' />
+ <node id='-96877' lat='28.09590' lon='75.93097' />
+ <node id='-96881' lat='28.08561' lon='76.04032' />
+ <node id='-96887' lat='27.93329' lon='75.91964' />
+ <node id='-96889' lat='27.85789' lon='75.99449' />
+ <node id='-96891' lat='27.81296' lon='76.22177' />
+ <node id='-96895' lat='28.01849' lon='76.17267' />
+ <node id='-96897' lat='28.02486' lon='76.20614' />
+ <node id='-96899' lat='28.05546' lon='76.17216' />
+ <node id='-96901' lat='28.04986' lon='76.22451' />
+ <node id='-96903' lat='28.07031' lon='76.24958' />
+ <node id='-96905' lat='28.01925' lon='76.31635' />
+ <node id='-96907' lat='28.02804' lon='76.34519' />
+ <node id='-96909' lat='28.07591' lon='76.35618' />
+ <node id='-96911' lat='28.09999' lon='76.30262' />
+ <node id='-96913' lat='28.12543' lon='76.36184' />
+ <node id='-96915' lat='28.17538' lon='76.27000' />
+ <node id='-96925' lat='28.15404' lon='76.49333' />
+ <node id='-96927' lat='27.97393' lon='76.54792' />
+ <node id='-96929' lat='28.01774' lon='76.66225' />
+ <node id='-96931' lat='28.09954' lon='76.65607' />
+ <node id='-96933' lat='28.16796' lon='76.79958' />
+ <node id='-96935' lat='28.21562' lon='76.80747' />
+ <node id='-96937' lat='28.22681' lon='76.86635' />
+ <node id='-96941' lat='28.14269' lon='76.96317' />
+ <node id='-96943' lat='27.67075' lon='76.88575' />
+ <node id='-96945' lat='27.65555' lon='76.96884' />
+ <node id='-96947' lat='27.78623' lon='77.03235' />
+ <node id='-97174' lat='28.49004' lon='77.32563' />
+ <node id='-97176' lat='28.48370' lon='77.31413' />
+ <node id='-97178' lat='28.48823' lon='77.30855' />
+ <node id='-97180' lat='28.49007' lon='77.30053' />
+ <node id='-97182' lat='28.49419' lon='77.30053' />
+ <node id='-97184' lat='28.49673' lon='77.28832' />
+ <node id='-97186' lat='28.49358' lon='77.27527' />
+ <node id='-97188' lat='28.48791' lon='77.26991' />
+ <node id='-97190' lat='28.48762' lon='77.26238' />
+ <node id='-97192' lat='28.47917' lon='77.24298' />
+ <node id='-97194' lat='28.46982' lon='77.23483' />
+ <node id='-97196' lat='28.45609' lon='77.23156' />
+ <node id='-97198' lat='28.45616' lon='77.24101' />
+ <node id='-97200' lat='28.44960' lon='77.24628' />
+ <node id='-97202' lat='28.42763' lon='77.24169' />
+ <node id='-97204' lat='28.41344' lon='77.22058' />
+ <node id='-97206' lat='28.40921' lon='77.17818' />
+ <node id='-97208' lat='28.40446' lon='77.17389' />
+ <node id='-97210' lat='28.40559' lon='77.17208' />
+ <node id='-97212' lat='28.42922' lon='77.16161' />
+ <node id='-97214' lat='28.43692' lon='77.14651' />
+ <node id='-97216' lat='28.43848' lon='77.14043' />
+ <node id='-97218' lat='28.43984' lon='77.13076' />
+ <node id='-97220' lat='28.47310' lon='77.11277' />
+ <node id='-97222' lat='28.49520' lon='77.11973' />
+ <node id='-97224' lat='28.50493' lon='77.09775' />
+ <node id='-97226' lat='28.50713' lon='77.09575' />
+ <node id='-97228' lat='28.51146' lon='77.09863' />
+ <node id='-97230' lat='28.51434' lon='77.09265' />
+ <node id='-97232' lat='28.51815' lon='77.08003' />
+ <node id='-97234' lat='28.51877' lon='77.07505' />
+ <node id='-97236' lat='28.52025' lon='77.07235' />
+ <node id='-97238' lat='28.51787' lon='77.07153' />
+ <node id='-97240' lat='28.51199' lon='77.06703' />
+ <node id='-97242' lat='28.51285' lon='77.06428' />
+ <node id='-97244' lat='28.51225' lon='77.06093' />
+ <node id='-97246' lat='28.51297' lon='77.05746' />
+ <node id='-97248' lat='28.51512' lon='77.05226' />
+ <node id='-97250' lat='28.51670' lon='77.04630' />
+ <node id='-97252' lat='28.52107' lon='77.04862' />
+ <node id='-97254' lat='28.52409' lon='77.04340' />
+ <node id='-97256' lat='28.52513' lon='77.04344' />
+ <node id='-97258' lat='28.53118' lon='77.03209' />
+ <node id='-97260' lat='28.53280' lon='77.02424' />
+ <node id='-97262' lat='28.54068' lon='77.01390' />
+ <node id='-97264' lat='28.53947' lon='77.00544' />
+ <node id='-97266' lat='28.53114' lon='77.00098' />
+ <node id='-97268' lat='28.52398' lon='77.01476' />
+ <node id='-97270' lat='28.52104' lon='77.01703' />
+ <node id='-97272' lat='28.51466' lon='77.00982' />
+ <node id='-97274' lat='28.51949' lon='76.99690' />
+ <node id='-97276' lat='28.51365' lon='76.99111' />
+ <node id='-97278' lat='28.52130' lon='76.97845' />
+ <node id='-97280' lat='28.50509' lon='76.95334' />
+ <node id='-97282' lat='28.50678' lon='76.92034' />
+ <node id='-97284' lat='28.51395' lon='76.90635' />
+ <node id='-97286' lat='28.50671' lon='76.90206' />
+ <node id='-97288' lat='28.50686' lon='76.89657' />
+ <node id='-97290' lat='28.50037' lon='76.89116' />
+ <node id='-97292' lat='28.50543' lon='76.88043' />
+ <node id='-97294' lat='28.51998' lon='76.88738' />
+ <node id='-97296' lat='28.52820' lon='76.87391' />
+ <node id='-97298' lat='28.54487' lon='76.86249' />
+ <node id='-97300' lat='28.55037' lon='76.84584' />
+ <node id='-97302' lat='28.58301' lon='76.83915' />
+ <node id='-97304' lat='28.58602' lon='76.86429' />
+ <node id='-97306' lat='28.63274' lon='76.89030' />
+ <node id='-97308' lat='28.62393' lon='76.90738' />
+ <node id='-97310' lat='28.63395' lon='76.91725' />
+ <node id='-97312' lat='28.61865' lon='76.93528' />
+ <node id='-97314' lat='28.63289' lon='76.94601' />
+ <node id='-97316' lat='28.64999' lon='76.92378' />
+ <node id='-97318' lat='28.66942' lon='76.93751' />
+ <node id='-97320' lat='28.66988' lon='76.95502' />
+ <node id='-97322' lat='28.68448' lon='76.95776' />
+ <node id='-97324' lat='28.69917' lon='76.96781' />
+ <node id='-97326' lat='28.71264' lon='76.94832' />
+ <node id='-97328' lat='28.73161' lon='76.96068' />
+ <node id='-97330' lat='28.74320' lon='76.95811' />
+ <node id='-97332' lat='28.75419' lon='76.94403' />
+ <node id='-97334' lat='28.76841' lon='76.95579' />
+ <node id='-97336' lat='28.78097' lon='76.94807' />
+ <node id='-97338' lat='28.79045' lon='76.95433' />
+ <node id='-97340' lat='28.79955' lon='76.94292' />
+ <node id='-97342' lat='28.81798' lon='76.95116' />
+ <node id='-97344' lat='28.81474' lon='76.96146' />
+ <node id='-97346' lat='28.82783' lon='76.97064' />
+ <node id='-97348' lat='28.82113' lon='76.98077' />
+ <node id='-97350' lat='28.84068' lon='76.99398' />
+ <node id='-97352' lat='28.83550' lon='77.04282' />
+ <node id='-97354' lat='28.86963' lon='77.06171' />
+ <node id='-97356' lat='28.87135' lon='77.07939' />
+ <node id='-97358' lat='28.88315' lon='77.08316' />
+ <node id='-97360' lat='28.87098' lon='77.09166' />
+ <node id='-97362' lat='28.86918' lon='77.11063' />
+ <node id='-97364' lat='28.85730' lon='77.12265' />
+ <node id='-97366' lat='28.86301' lon='77.13406' />
+ <node id='-97368' lat='28.85572' lon='77.14616' />
+ <node id='-97370' lat='28.83858' lon='77.14282' />
+ <node id='-97372' lat='28.83670' lon='77.15681' />
+ <node id='-97374' lat='28.85865' lon='77.17457' />
+ <node id='-97431' lat='30.76411' lon='76.82825' />
+ <node id='-97432' lat='30.68693' lon='76.81468' />
+ <node id='-97434' lat='30.67527' lon='76.80250' />
+ <node id='-97436' lat='30.67054' lon='76.78945' />
+ <node id='-97438' lat='30.68619' lon='76.76095' />
+ <node id='-97440' lat='30.68512' lon='76.75130' />
+ <node id='-97442' lat='30.70136' lon='76.73894' />
+ <node id='-97444' lat='30.72479' lon='76.73014' />
+ <node id='-97446' lat='30.73202' lon='76.71967' />
+ <node id='-97448' lat='30.74190' lon='76.71306' />
+ <node id='-97450' lat='30.74699' lon='76.69014' />
+ <node id='-97452' lat='30.75968' lon='76.69066' />
+ <node id='-97454' lat='30.77045' lon='76.70808' />
+ <node id='-97456' lat='30.77067' lon='76.72285' />
+ <node id='-97458' lat='30.79080' lon='76.73864' />
+ <node id='-97460' lat='30.79928' lon='76.75975' />
+ <node id='-97462' lat='30.78483' lon='76.77700' />
+ <node id='-97464' lat='30.77683' lon='76.76911' />
+ <node id='-97466' lat='30.77392' lon='76.78104' />
+ <node id='-97468' lat='30.78623' lon='76.79632' />
+ <node id='-97470' lat='30.77900' lon='76.80413' />
+ <node id='-97472' lat='30.76647' lon='76.79254' />
+ <node id='-97487' lat='30.66139' lon='76.81949' />
+ <node id='-97489' lat='30.65755' lon='76.83794' />
+ <node id='-97491' lat='30.66693' lon='76.84902' />
+ <node id='-97493' lat='30.65762' lon='76.85923' />
+ <node id='-97495' lat='30.64160' lon='76.85846' />
+ <node id='-97497' lat='30.63997' lon='76.87133' />
+ <node id='-97499' lat='30.60504' lon='76.91193' />
+ <node id='-97501' lat='30.55206' lon='76.89931' />
+ <node id='-97503' lat='30.53579' lon='76.89571' />
+ <node id='-97505' lat='30.52618' lon='76.92026' />
+ <node id='-97507' lat='30.44038' lon='76.88798' />
+ <node id='-97509' lat='30.40145' lon='76.91579' />
+ <node id='-97511' lat='30.39686' lon='76.92987' />
+ <node id='-97513' lat='30.35569' lon='76.88833' />
+ <node id='-97515' lat='30.36265' lon='76.87700' />
+ <node id='-97517' lat='30.38516' lon='76.88438' />
+ <node id='-97519' lat='30.40604' lon='76.84885' />
+ <node id='-97523' lat='30.43328' lon='76.83151' />
+ <node id='-97525' lat='30.41196' lon='76.80747' />
+ <node id='-97527' lat='30.43727' lon='76.75769' />
+ <node id='-97531' lat='30.39257' lon='76.69864' />
+ <node id='-97537' lat='30.36458' lon='76.73375' />
+ <node id='-97549' lat='30.26381' lon='76.56045' />
+ <node id='-97559' lat='30.20493' lon='76.63873' />
+ <node id='-97561' lat='30.14497' lon='76.62380' />
+ <node id='-97563' lat='30.07978' lon='76.60903' />
+ <node id='-97565' lat='30.07830' lon='76.50089' />
+ <node id='-97567' lat='30.10385' lon='76.44664' />
+ <node id='-97569' lat='30.15195' lon='76.43394' />
+ <node id='-97579' lat='30.12656' lon='76.22760' />
+ <node id='-97585' lat='29.88947' lon='76.18057' />
+ <node id='-97587' lat='29.88649' lon='76.23550' />
+ <node id='-97589' lat='29.85761' lon='76.24168' />
+ <node id='-97591' lat='29.80222' lon='76.11602' />
+ <node id='-97593' lat='29.80877' lon='76.08169' />
+ <node id='-97595' lat='29.74798' lon='76.04049' />
+ <node id='-97597' lat='29.73069' lon='75.94230' />
+ <node id='-97599' lat='29.75424' lon='75.86162' />
+ <node id='-97601' lat='29.81354' lon='75.83003' />
+ <node id='-97603' lat='29.81145' lon='75.70232' />
+ <node id='-97605' lat='29.75573' lon='75.69339' />
+ <node id='-97607' lat='29.77987' lon='75.65288' />
+ <node id='-97609' lat='29.74560' lon='75.60173' />
+ <node id='-97611' lat='29.80788' lon='75.44448' />
+ <node id='-97613' lat='29.76378' lon='75.39813' />
+ <node id='-97615' lat='29.71161' lon='75.37891' />
+ <node id='-97617' lat='29.68984' lon='75.33908' />
+ <node id='-97619' lat='29.66747' lon='75.34046' />
+ <node id='-97621' lat='29.60779' lon='75.27934' />
+ <node id='-97623' lat='29.58122' lon='75.31162' />
+ <node id='-97625' lat='29.54598' lon='75.22716' />
+ <node id='-97627' lat='29.61495' lon='75.21858' />
+ <node id='-97629' lat='29.66747' lon='75.15747' />
+ <node id='-97631' lat='29.69073' lon='75.19660' />
+ <node id='-97633' lat='29.75603' lon='75.22991' />
+ <node id='-97635' lat='29.83200' lon='75.20072' />
+ <node id='-97637' lat='29.83826' lon='75.17806' />
+ <node id='-97639' lat='29.77063' lon='75.14099' />
+ <node id='-97641' lat='29.81294' lon='75.10150' />
+ <node id='-97643' lat='29.91774' lon='75.09155' />
+ <node id='-97647' lat='29.86357' lon='74.98821' />
+ <node id='-97649' lat='29.96296' lon='74.87285' />
+ <node id='-97651' lat='29.99092' lon='74.80144' />
+ <node id='-97653' lat='29.96950' lon='74.69467' />
+ <node id='-97655' lat='29.90494' lon='74.63115' />
+ <node id='-97859' lat='30.49246' lon='77.22083' />
+ <node id='-97861' lat='30.80024' lon='76.99802' />
+ <node id='-97863' lat='30.83415' lon='76.92386' />
+ <node id='-97865' lat='30.89751' lon='76.90017' />
+ <node id='-97867' lat='30.90870' lon='76.77040' />
+ <node id='-97883' lat='32.52664' lon='75.82936' />
+ <node id='-97885' lat='32.41474' lon='75.93921' />
+ <node id='-97887' lat='32.28364' lon='75.75210' />
+ <node id='-97889' lat='32.24707' lon='75.64756' />
+ <node id='-97891' lat='32.10148' lon='75.62885' />
+ <node id='-97893' lat='32.07384' lon='75.58284' />
+ <node id='-97895' lat='32.06541' lon='75.71948' />
+ <node id='-97897' lat='31.94808' lon='75.89904' />
+ <node id='-97899' lat='31.81281' lon='75.96977' />
+ <node id='-97901' lat='31.80522' lon='75.92822' />
+ <node id='-97903' lat='31.39526' lon='76.16546' />
+ <node id='-97905' lat='31.28999' lon='76.18743' />
+ <node id='-97907' lat='31.34278' lon='76.34056' />
+ <node id='-97909' lat='31.40082' lon='76.31996' />
+ <node id='-97911' lat='31.43569' lon='76.37283' />
+ <node id='-97913' lat='31.27913' lon='76.50672' />
+ <node id='-97915' lat='31.21015' lon='76.64817' />
+ <node id='-97917' lat='31.00144' lon='76.61384' />
+ <node id='-98135' lat='26.98495' lon='92.64410' />
+ <node id='-98137' lat='27.03894' lon='92.64289' />
+ <node id='-98139' lat='27.00591' lon='92.90313' />
+ <node id='-98141' lat='26.91900' lon='93.03291' />
+ <node id='-98143' lat='26.96308' lon='93.38035' />
+ <node id='-98145' lat='26.93859' lon='93.50257' />
+ <node id='-98147' lat='26.97838' lon='93.68385' />
+ <node id='-98149' lat='27.07746' lon='93.83354' />
+ <node id='-98151' lat='27.15142' lon='93.80882' />
+ <node id='-98153' lat='27.48390' lon='94.15489' />
+ <node id='-98155' lat='27.52471' lon='94.26269' />
+ <node id='-98157' lat='27.62331' lon='94.21600' />
+ <node id='-98159' lat='27.57280' lon='94.46937' />
+ <node id='-98161' lat='27.74036' lon='94.86968' />
+ <node id='-98163' lat='27.87125' lon='95.31600' />
+ <node id='-98165' lat='27.88157' lon='95.51994' />
+ <node id='-98167' lat='27.96105' lon='95.63117' />
+ <node id='-98169' lat='27.96650' lon='95.97518' />
+ <node id='-98171' lat='27.73519' lon='95.76335' />
+ <node id='-98173' lat='27.52836' lon='95.88523' />
+ <node id='-98175' lat='27.43333' lon='95.86189' />
+ <node id='-98177' lat='27.37481' lon='95.99647' />
+ <node id='-98179' lat='27.27294' lon='95.89279' />
+ <node id='-98181' lat='27.24730' lon='95.49041' />
+ <node id='-98183' lat='27.12209' lon='95.46295' />
+ <node id='-98185' lat='27.02915' lon='95.19515' />
+ <node id='-98271' lat='25.56350' lon='89.89562' />
+ <node id='-98273' lat='25.60314' lon='90.01922' />
+ <node id='-98275' lat='25.73867' lon='89.89906' />
+ <node id='-98277' lat='25.96113' lon='90.10642' />
+ <node id='-98279' lat='26.00310' lon='90.48065' />
+ <node id='-98281' lat='25.87714' lon='90.61729' />
+ <node id='-98283' lat='25.95001' lon='90.95443' />
+ <node id='-98285' lat='25.71887' lon='91.24969' />
+ <node id='-98287' lat='26.10982' lon='91.84432' />
+ <node id='-98289' lat='25.99755' lon='91.94732' />
+ <node id='-98291' lat='26.06788' lon='92.30438' />
+ <node id='-98293' lat='25.69846' lon='92.13958' />
+ <node id='-98295' lat='25.57465' lon='92.64770' />
+ <node id='-98297' lat='25.21612' lon='92.79464' />
+ <node id='-98299' lat='25.01471' lon='92.39147' />
+ <node id='-98363' lat='26.92451' lon='94.88548' />
+ <node id='-98365' lat='26.79771' lon='94.78248' />
+ <node id='-98367' lat='26.61922' lon='94.40551' />
+ <node id='-98369' lat='26.52772' lon='94.39659' />
+ <node id='-98371' lat='26.45459' lon='94.30801' />
+ <node id='-98373' lat='26.56580' lon='94.27093' />
+ <node id='-98375' lat='26.16468' lon='93.99902' />
+ <node id='-98377' lat='25.90185' lon='93.96537' />
+ <node id='-98379' lat='25.81472' lon='93.79371' />
+ <node id='-98381' lat='25.97594' lon='93.78341' />
+ <node id='-98383' lat='25.92717' lon='93.69964' />
+ <node id='-98385' lat='25.67433' lon='93.51905' />
+ <node id='-98387' lat='25.53872' lon='93.31924' />
+ <node id='-98389' lat='25.30740' lon='93.47236' />
+ <node id='-98391' lat='24.80169' lon='93.17985' />
+ <node id='-98393' lat='24.81883' lon='93.10569' />
+ <node id='-98395' lat='24.40026' lon='93.02329' />
+ <node id='-98397' lat='24.39588' lon='92.83790' />
+ <node id='-98399' lat='24.52088' lon='92.76168' />
+ <node id='-98401' lat='24.16617' lon='92.52685' />
+ <node id='-98403' lat='24.14299' lon='92.44239' />
+ <node id='-98405' lat='24.25635' lon='92.42317' />
+ <node id='-98407' lat='24.25259' lon='92.21786' />
+ <node id='-98409' lat='24.39213' lon='92.27931' />
+ <node id='-98411' lat='24.50245' lon='92.22953' />
+ <node id='-98413' lat='24.54435' lon='92.15796' />
+ <node id='-98461' lat='25.19748' lon='93.61175' />
+ <node id='-98463' lat='25.55854' lon='93.86993' />
+ <node id='-98465' lat='25.50588' lon='94.33685' />
+ <node id='-98467' lat='25.69289' lon='94.58953' />
+ <node id='-98469' lat='25.51084' lon='94.55932' />
+ <node id='-98513' lat='24.11354' lon='92.98416' />
+ <node id='-98558' lat='24.25406' lon='92.29819' />
+ <node id='-98560' lat='23.86543' lon='92.31777' />
+ <node id='-98580' lat='23.00043' lon='91.73240' />
+ <node id='-98719' lat='31.85248' lon='109.20066' />
+ <node id='-98721' lat='31.71823' lon='109.27619' />
+ <node id='-98723' lat='31.72933' lon='109.58381' />
+ <node id='-98725' lat='32.10177' lon='109.62364' />
+ <node id='-98727' lat='32.30280' lon='109.49901' />
+ <node id='-98729' lat='32.48543' lon='109.55703' />
+ <node id='-98731' lat='32.61508' lon='109.71393' />
+ <node id='-98733' lat='32.55144' lon='110.04524' />
+ <node id='-98735' lat='32.62029' lon='110.19218' />
+ <node id='-98737' lat='32.81238' lon='110.13725' />
+ <node id='-98739' lat='32.86041' lon='110.03391' />
+ <node id='-98741' lat='32.87482' lon='110.02481' />
+ <node id='-98743' lat='32.91100' lon='109.86259' />
+ <node id='-98745' lat='32.87929' lon='109.79049' />
+ <node id='-98747' lat='32.91273' lon='109.75925' />
+ <node id='-98749' lat='33.06910' lon='109.79324' />
+ <node id='-98751' lat='33.15479' lon='109.42794' />
+ <node id='-98753' lat='33.27830' lon='109.61299' />
+ <node id='-98755' lat='33.19158' lon='110.03974' />
+ <node id='-98757' lat='33.20996' lon='110.16197' />
+ <node id='-98759' lat='33.15882' lon='110.22926' />
+ <node id='-98761' lat='33.17721' lon='110.46958' />
+ <node id='-98763' lat='33.26653' lon='110.55713' />
+ <node id='-98765' lat='33.09384' lon='110.70030' />
+ <node id='-98767' lat='33.26050' lon='110.98010' />
+ <node id='-98769' lat='33.56771' lon='111.01890' />
+ <node id='-98771' lat='33.67978' lon='110.84106' />
+ <node id='-98773' lat='33.89093' lon='110.58700' />
+ <node id='-98775' lat='34.18056' lon='110.63850' />
+ <node id='-98777' lat='34.51900' lon='110.35388' />
+ <node id='-98779' lat='34.58432' lon='110.41122' />
+ <node id='-98781' lat='34.62784' lon='110.23921' />
+ <node id='-98783' lat='34.90733' lon='110.22720' />
+ <node id='-98785' lat='35.13900' lon='110.36041' />
+ <node id='-98787' lat='35.30728' lon='110.40572' />
+ <node id='-98789' lat='35.64948' lon='110.61035' />
+ <node id='-98791' lat='36.16060' lon='110.43594' />
+ <node id='-98793' lat='36.56039' lon='110.48950' />
+ <node id='-98795' lat='36.99816' lon='110.39474' />
+ <node id='-98801' lat='37.45169' lon='110.74665' />
+ <node id='-98803' lat='37.62946' lon='110.77377' />
+ <node id='-98805' lat='37.92578' lon='110.58357' />
+ <node id='-98807' lat='38.02862' lon='110.49636' />
+ <node id='-98809' lat='38.20905' lon='110.51490' />
+ <node id='-98811' lat='38.44713' lon='110.80192' />
+ <node id='-98813' lat='38.45842' lon='110.87333' />
+ <node id='-98815' lat='38.65522' lon='110.88775' />
+ <node id='-98817' lat='38.75836' lon='110.95745' />
+ <node id='-98819' lat='38.90706' lon='111.00963' />
+ <node id='-98821' lat='38.97836' lon='110.97495' />
+ <node id='-98823' lat='39.02158' lon='111.04637' />
+ <node id='-98825' lat='39.02985' lon='111.09134' />
+ <node id='-98827' lat='39.10741' lon='111.15760' />
+ <node id='-98829' lat='39.30003' lon='111.23897' />
+ <node id='-98831' lat='39.30508' lon='111.19228' />
+ <node id='-98911' lat='26.30449' lon='109.45129' />
+ <node id='-98913' lat='26.28664' lon='109.28649' />
+ <node id='-98915' lat='26.57931' lon='109.38056' />
+ <node id='-98917' lat='26.70022' lon='109.28581' />
+ <node id='-98919' lat='26.75726' lon='109.51652' />
+ <node id='-98921' lat='27.06524' lon='109.49043' />
+ <node id='-98923' lat='27.15264' lon='109.40734' />
+ <node id='-98925' lat='27.06462' lon='109.13268' />
+ <node id='-98927' lat='27.00652' lon='108.87451' />
+ <node id='-98929' lat='27.08908' lon='108.78936' />
+ <node id='-98931' lat='27.29643' lon='109.04720' />
+ <node id='-98933' lat='27.33578' lon='109.04651' />
+ <node id='-98935' lat='27.34950' lon='109.10659' />
+ <node id='-98937' lat='27.45344' lon='109.14642' />
+ <node id='-98939' lat='27.42541' lon='109.29370' />
+ <node id='-98941' lat='27.57220' lon='109.45197' />
+ <node id='-98943' lat='27.69508' lon='109.46708' />
+ <node id='-98945' lat='27.78198' lon='109.33799' />
+ <node id='-98947' lat='27.98560' lon='109.31533' />
+ <node id='-98949' lat='28.03683' lon='109.38056' />
+ <node id='-98951' lat='28.05531' lon='109.29336' />
+ <node id='-98953' lat='28.27717' lon='109.39807' />
+ <node id='-98955' lat='28.31450' lon='109.26881' />
+ <node id='-98957' lat='28.37720' lon='109.28495' />
+ <node id='-98959' lat='28.39034' lon='109.26160' />
+ <node id='-98961' lat='28.47110' lon='109.25302' />
+ <node id='-98963' lat='28.49849' lon='109.26993' />
+ <node id='-98965' lat='28.51787' lon='109.26727' />
+ <node id='-98967' lat='28.52202' lon='109.27645' />
+ <node id='-98969' lat='28.57268' lon='109.29121' />
+ <node id='-98971' lat='28.58595' lon='109.31576' />
+ <node id='-98973' lat='28.62913' lon='109.29671' />
+ <node id='-98975' lat='28.60275' lon='109.19466' />
+ <node id='-98977' lat='28.63184' lon='109.18556' />
+ <node id='-98979' lat='28.73018' lon='109.29885' />
+ <node id='-98981' lat='28.78255' lon='109.23688' />
+ <node id='-98983' lat='28.87985' lon='109.23208' />
+ <node id='-98985' lat='29.05827' lon='109.31877' />
+ <node id='-99011' lat='28.50437' lon='109.26898' />
+ <node id='-99017' lat='28.49690' lon='109.24324' />
+ <node id='-99021' lat='28.48317' lon='109.22753' />
+ <node id='-99023' lat='28.48642' lon='109.20075' />
+ <node id='-99025' lat='28.45820' lon='109.17054' />
+ <node id='-99027' lat='28.42597' lon='109.15981' />
+ <node id='-99029' lat='28.18884' lon='109.08531' />
+ <node id='-99031' lat='28.20972' lon='109.02385' />
+ <node id='-99033' lat='28.15828' lon='108.99707' />
+ <node id='-99035' lat='28.22182' lon='108.88137' />
+ <node id='-99037' lat='28.20730' lon='108.75091' />
+ <node id='-99039' lat='28.29228' lon='108.72001' />
+ <node id='-99041' lat='28.31465' lon='108.76739' />
+ <node id='-99043' lat='28.42492' lon='108.77872' />
+ <node id='-99045' lat='28.50098' lon='108.70731' />
+ <node id='-99047' lat='28.46506' lon='108.63178' />
+ <node id='-99049' lat='28.40136' lon='108.68911' />
+ <node id='-99051' lat='28.33430' lon='108.65959' />
+ <node id='-99053' lat='28.32523' lon='108.60706' />
+ <node id='-99055' lat='28.37931' lon='108.56414' />
+ <node id='-99057' lat='28.44092' lon='108.60603' />
+ <node id='-99059' lat='28.54230' lon='108.56552' />
+ <node id='-99061' lat='28.54924' lon='108.60877' />
+ <node id='-99063' lat='28.64570' lon='108.63109' />
+ <node id='-99065' lat='28.65112' lon='108.52981' />
+ <node id='-99067' lat='28.62852' lon='108.45874' />
+ <node id='-99069' lat='28.68637' lon='108.33103' />
+ <node id='-99071' lat='28.80647' lon='108.38012' />
+ <node id='-99073' lat='29.09577' lon='108.28708' />
+ <node id='-99075' lat='29.02405' lon='108.22837' />
+ <node id='-99077' lat='29.07207' lon='108.18477' />
+ <node id='-99079' lat='29.05737' lon='108.14323' />
+ <node id='-99081' lat='29.09037' lon='108.06220' />
+ <node id='-99083' lat='29.04206' lon='108.00899' />
+ <node id='-99085' lat='29.01114' lon='107.88574' />
+ <node id='-99087' lat='28.96309' lon='107.84042' />
+ <node id='-99089' lat='29.21031' lon='107.75184' />
+ <node id='-99091' lat='29.14916' lon='107.67219' />
+ <node id='-99093' lat='29.19472' lon='107.40440' />
+ <node id='-99095' lat='29.00333' lon='107.36457' />
+ <node id='-99097' lat='28.93845' lon='107.44148' />
+ <node id='-99099' lat='28.76103' lon='107.26089' />
+ <node id='-99101' lat='28.88977' lon='107.18330' />
+ <node id='-99103' lat='28.86031' lon='106.98211' />
+ <node id='-99105' lat='28.76585' lon='106.96838' />
+ <node id='-99107' lat='28.80436' lon='106.88804' />
+ <node id='-99109' lat='28.75140' lon='106.81182' />
+ <node id='-99111' lat='28.62611' lon='106.86881' />
+ <node id='-99113' lat='28.58934' lon='106.81251' />
+ <node id='-99115' lat='28.62732' lon='106.76238' />
+ <node id='-99117' lat='28.55919' lon='106.77406' />
+ <node id='-99119' lat='28.44997' lon='106.70677' />
+ <node id='-99121' lat='28.51153' lon='106.55914' />
+ <node id='-99123' lat='28.66649' lon='106.65183' />
+ <node id='-99125' lat='28.70624' lon='106.57150' />
+ <node id='-99127' lat='28.84106' lon='106.46781' />
+ <node id='-99129' lat='28.78631' lon='106.44927' />
+ <node id='-99131' lat='28.67673' lon='106.51245' />
+ <node id='-99133' lat='28.53567' lon='106.47743' />
+ <node id='-99241' lat='29.12217' lon='109.22916' />
+ <node id='-99243' lat='29.21855' lon='109.10745' />
+ <node id='-99245' lat='29.36691' lon='109.10419' />
+ <node id='-99247' lat='29.40550' lon='109.05029' />
+ <node id='-99249' lat='29.33085' lon='108.97647' />
+ <node id='-99251' lat='29.32651' lon='108.90918' />
+ <node id='-99253' lat='29.43601' lon='108.93836' />
+ <node id='-99255' lat='29.46411' lon='108.86455' />
+ <node id='-99257' lat='29.60331' lon='108.90918' />
+ <node id='-99259' lat='29.70132' lon='108.68499' />
+ <node id='-99261' lat='29.85255' lon='108.67641' />
+ <node id='-99263' lat='29.86863' lon='108.60980' />
+ <node id='-99265' lat='29.71966' lon='108.49170' />
+ <node id='-99267' lat='29.84064' lon='108.36570' />
+ <node id='-99269' lat='29.87220' lon='108.52020' />
+ <node id='-99271' lat='30.25669' lon='108.58131' />
+ <node id='-99273' lat='30.38827' lon='108.40072' />
+ <node id='-99275' lat='30.49306' lon='108.41789' />
+ <node id='-99277' lat='30.48211' lon='108.56998' />
+ <node id='-99279' lat='30.53979' lon='108.63796' />
+ <node id='-99281' lat='30.60098' lon='108.65890' />
+ <node id='-99283' lat='30.49720' lon='108.74130' />
+ <node id='-99285' lat='30.50311' lon='108.83056' />
+ <node id='-99287' lat='30.62934' lon='108.96995' />
+ <node id='-99289' lat='30.65637' lon='109.04273' />
+ <node id='-99291' lat='30.63850' lon='109.11861' />
+ <node id='-99293' lat='30.59418' lon='109.08256' />
+ <node id='-99295' lat='30.52086' lon='109.13749' />
+ <node id='-99297' lat='30.63584' lon='109.30469' />
+ <node id='-99299' lat='30.48625' lon='109.35138' />
+ <node id='-99301' lat='30.66154' lon='109.53025' />
+ <node id='-99303' lat='30.91106' lon='109.92919' />
+ <node id='-99305' lat='30.79729' lon='110.06652' />
+ <node id='-99307' lat='30.98290' lon='110.16952' />
+ <node id='-99309' lat='31.09527' lon='110.11390' />
+ <node id='-99311' lat='31.15405' lon='110.20042' />
+ <node id='-99313' lat='31.41108' lon='110.12695' />
+ <node id='-99315' lat='31.58497' lon='109.73522' />
+ <node id='-99317' lat='31.70830' lon='109.72595' />
+ <node id='-99434' lat='20.26220' lon='111.04979' />
+ <node id='-99504' lat='23.10828' lon='117.76968' />
+ <node id='-99515' lat='23.73884' lon='117.05863' />
+ <node id='-99519' lat='23.90655' lon='116.96353' />
+ <node id='-99521' lat='23.95739' lon='116.97589' />
+ <node id='-99523' lat='24.00099' lon='116.97933' />
+ <node id='-99525' lat='24.09097' lon='116.91478' />
+ <node id='-99527' lat='24.18402' lon='116.99512' />
+ <node id='-99529' lat='24.23256' lon='116.93023' />
+ <node id='-99531' lat='24.40025' lon='116.89693' />
+ <node id='-99537' lat='24.54150' lon='116.75170' />
+ <node id='-99539' lat='24.68352' lon='116.81076' />
+ <node id='-99545' lat='24.60332' lon='116.51859' />
+ <node id='-99547' lat='24.67977' lon='116.48735' />
+ <node id='-99551' lat='24.80231' lon='116.37062' />
+ <node id='-99553' lat='24.84313' lon='116.40975' />
+ <node id='-99555' lat='24.86899' lon='116.34761' />
+ <node id='-99557' lat='24.79857' lon='116.29886' />
+ <node id='-99561' lat='24.84718' lon='116.20754' />
+ <node id='-99563' lat='24.85528' lon='116.05201' />
+ <node id='-99565' lat='24.92193' lon='115.96618' />
+ <node id='-99567' lat='24.94123' lon='115.88859' />
+ <node id='-99569' lat='24.87833' lon='115.89889' />
+ <node id='-99571' lat='24.86743' lon='115.86696' />
+ <node id='-99573' lat='24.91539' lon='115.82405' />
+ <node id='-99575' lat='24.79109' lon='115.76362' />
+ <node id='-99577' lat='24.71221' lon='115.76499' />
+ <node id='-99579' lat='24.69131' lon='115.80379' />
+ <node id='-99581' lat='24.63703' lon='115.78559' />
+ <node id='-99583' lat='24.56710' lon='115.84327' />
+ <node id='-99585' lat='24.54056' lon='115.69358' />
+ <node id='-99587' lat='24.61799' lon='115.65444' />
+ <node id='-99589' lat='24.62954' lon='115.56381' />
+ <node id='-99591' lat='24.76584' lon='115.46699' />
+ <node id='-99593' lat='24.76803' lon='115.37738' />
+ <node id='-99595' lat='24.66792' lon='115.10822' />
+ <node id='-99597' lat='24.70753' lon='115.06599' />
+ <node id='-99599' lat='24.64670' lon='114.93415' />
+ <node id='-99601' lat='24.67478' lon='114.92660' />
+ <node id='-99603' lat='24.55805' lon='114.85897' />
+ <node id='-99605' lat='24.58178' lon='114.84420' />
+ <node id='-99607' lat='24.60550' lon='114.72576' />
+ <node id='-99613' lat='24.48464' lon='114.41780' />
+ <node id='-99615' lat='24.58865' lon='114.35462' />
+ <node id='-99617' lat='24.65450' lon='114.17541' />
+ <node id='-99619' lat='25.08746' lon='114.57092' />
+ <node id='-99621' lat='25.13036' lon='114.74739' />
+ <node id='-99623' lat='25.42281' lon='114.55650' />
+ <node id='-99625' lat='25.29685' lon='114.19464' />
+ <node id='-99627' lat='25.28319' lon='114.00924' />
+ <node id='-99629' lat='25.40916' lon='113.98315' />
+ <node id='-99631' lat='25.30802' lon='113.56635' />
+ <node id='-99633' lat='25.51486' lon='113.26217' />
+ <node id='-99637' lat='25.47039' lon='113.12725' />
+ <node id='-99639' lat='25.34976' lon='113.01721' />
+ <node id='-99641' lat='25.31501' lon='112.89653' />
+ <node id='-99643' lat='25.34278' lon='112.84984' />
+ <node id='-99645' lat='25.24857' lon='112.87130' />
+ <node id='-99647' lat='25.24857' lon='112.98923' />
+ <node id='-99649' lat='25.20059' lon='113.02854' />
+ <node id='-99651' lat='25.16361' lon='112.96674' />
+ <node id='-99657' lat='24.93999' lon='113.00571' />
+ <node id='-99659' lat='24.89328' lon='112.77980' />
+ <node id='-99661' lat='25.08622' lon='112.70393' />
+ <node id='-99663' lat='25.13751' lon='112.65174' />
+ <node id='-99675' lat='25.18987' lon='112.18963' />
+ <node id='-99677' lat='25.00535' lon='112.13504' />
+ <node id='-99679' lat='24.96582' lon='112.11547' />
+ <node id='-99681' lat='24.91944' lon='112.17143' />
+ <node id='-99683' lat='24.82662' lon='112.15015' />
+ <node id='-99758' lat='29.11829' lon='109.23460' />
+ <node id='-99760' lat='29.55613' lon='109.45678' />
+ <node id='-99762' lat='29.62331' lon='109.53609' />
+ <node id='-99764' lat='29.60928' lon='109.70088' />
+ <node id='-99766' lat='29.76556' lon='109.78637' />
+ <node id='-99768' lat='29.78374' lon='110.14514' />
+ <node id='-99770' lat='29.63345' lon='110.37036' />
+ <node id='-99772' lat='29.77272' lon='110.64742' />
+ <node id='-99774' lat='29.91923' lon='110.49430' />
+ <node id='-99776' lat='30.06523' lon='110.52246' />
+ <node id='-99778' lat='30.04888' lon='110.75386' />
+ <node id='-99780' lat='30.12523' lon='110.75729' />
+ <node id='-99782' lat='30.06493' lon='110.94646' />
+ <node id='-99784' lat='30.04383' lon='111.24481' />
+ <node id='-99786' lat='29.91268' lon='111.40274' />
+ <node id='-99788' lat='29.93232' lon='111.51912' />
+ <node id='-99790' lat='29.89006' lon='111.60530' />
+ <node id='-99792' lat='29.91209' lon='111.79447' />
+ <node id='-99794' lat='29.82843' lon='111.95548' />
+ <node id='-99796' lat='29.73188' lon='112.06706' />
+ <node id='-99798' lat='29.66001' lon='112.10861' />
+ <node id='-99800' lat='29.65673' lon='112.23770' />
+ <node id='-99802' lat='29.50147' lon='112.28713' />
+ <node id='-99804' lat='29.64330' lon='112.46566' />
+ <node id='-99806' lat='29.59734' lon='112.68093' />
+ <node id='-99808' lat='29.74917' lon='112.80796' />
+ <node id='-99810' lat='29.79328' lon='112.89550' />
+ <node id='-99812' lat='29.69014' lon='112.92640' />
+ <node id='-99814' lat='29.47188' lon='112.94769' />
+ <node id='-99816' lat='29.46112' lon='113.15505' />
+ <node id='-99818' lat='29.82813' lon='113.51898' />
+ <node id='-99820' lat='29.67254' lon='113.56704' />
+ <node id='-99822' lat='29.58928' lon='113.73630' />
+ <node id='-99824' lat='29.52118' lon='113.62403' />
+ <node id='-99826' lat='29.44767' lon='113.75690' />
+ <node id='-99828' lat='29.25914' lon='113.59588' />
+ <node id='-99830' lat='29.21870' lon='113.69132' />
+ <node id='-99832' lat='29.06637' lon='113.69132' />
+ <node id='-99834' lat='29.10837' lon='113.81835' />
+ <node id='-99836' lat='29.04056' lon='113.85749' />
+ <node id='-99838' lat='29.05196' lon='113.94470' />
+ <node id='-99840' lat='28.89758' lon='114.01817' />
+ <node id='-99842' lat='28.77187' lon='114.14932' />
+ <node id='-99844' lat='28.55919' lon='114.07653' />
+ <node id='-99846' lat='28.38233' lon='114.25094' />
+ <node id='-99848' lat='28.15253' lon='113.99963' />
+ <node id='-99850' lat='28.06289' lon='114.03945' />
+ <node id='-99852' lat='27.94770' lon='113.74351' />
+ <node id='-99854' lat='27.87550' lon='113.72085' />
+ <node id='-99856' lat='27.81782' lon='113.75656' />
+ <node id='-99858' lat='27.63365' lon='113.59863' />
+ <node id='-99860' lat='27.42114' lon='113.59760' />
+ <node id='-99862' lat='27.41017' lon='113.62232' />
+ <node id='-99864' lat='27.34859' lon='113.62232' />
+ <node id='-99866' lat='27.38548' lon='113.87500' />
+ <node id='-99868' lat='27.11781' lon='113.77715' />
+ <node id='-99870' lat='26.94716' lon='113.91517' />
+ <node id='-99872' lat='26.79342' lon='113.83895' />
+ <node id='-99874' lat='26.65513' lon='113.86402' />
+ <node id='-99876' lat='26.61277' lon='113.91208' />
+ <node id='-99878' lat='26.57624' lon='114.10400' />
+ <node id='-99880' lat='26.40847' lon='114.07482' />
+ <node id='-99882' lat='26.18193' lon='113.94058' />
+ <node id='-99884' lat='26.20042' lon='114.23789' />
+ <node id='-99888' lat='26.02100' lon='114.02606' />
+ <node id='-99890' lat='25.89258' lon='114.00787' />
+ <node id='-99892' lat='25.69908' lon='113.91448' />
+ <node id='-100001' lat='33.10534' lon='111.18163' />
+ <node id='-100003' lat='32.85622' lon='111.29665' />
+ <node id='-100005' lat='32.73732' lon='111.46488' />
+ <node id='-100009' lat='32.59455' lon='111.57474' />
+ <node id='-100013' lat='32.62636' lon='111.67293' />
+ <node id='-100015' lat='32.45864' lon='112.00080' />
+ <node id='-100017' lat='32.32862' lon='112.31323' />
+ <node id='-100019' lat='32.39851' lon='112.55149' />
+ <node id='-100021' lat='32.39213' lon='113.25050' />
+ <node id='-100023' lat='32.27784' lon='113.41804' />
+ <node id='-100025' lat='32.43329' lon='113.71467' />
+ <node id='-100027' lat='32.26855' lon='113.75038' />
+ <node id='-100029' lat='32.08432' lon='113.72840' />
+ <node id='-100031' lat='31.84314' lon='113.84582' />
+ <node id='-100033' lat='31.75736' lon='113.98590' />
+ <node id='-100035' lat='31.85452' lon='114.18708' />
+ <node id='-100037' lat='31.71648' lon='114.58465' />
+ <node id='-100039' lat='31.45092' lon='114.83184' />
+ <node id='-100041' lat='31.58204' lon='115.21018' />
+ <node id='-100043' lat='31.14465' lon='115.57823' />
+ <node id='-100045' lat='31.20604' lon='115.69667' />
+ <node id='-100047' lat='31.10527' lon='115.77461' />
+ <node id='-100049' lat='31.14230' lon='115.87692' />
+ <node id='-100051' lat='30.96966' lon='116.07776' />
+ <node id='-100053' lat='30.83120' lon='115.84156' />
+ <node id='-100055' lat='30.75865' lon='115.85082' />
+ <node id='-100057' lat='30.67010' lon='115.76980' />
+ <node id='-100059' lat='30.50992' lon='115.90061' />
+ <node id='-100061' lat='30.30472' lon='115.91949' />
+ <node id='-100063' lat='30.12434' lon='116.08222' />
+ <node id='-100065' lat='29.82754' lon='116.12823' />
+ <node id='-100067' lat='29.71906' lon='115.93803' />
+ <node id='-100069' lat='29.85851' lon='115.65994' />
+ <node id='-100071' lat='29.83230' lon='115.50064' />
+ <node id='-100073' lat='29.67492' lon='115.40107' />
+ <node id='-100075' lat='29.63674' lon='115.26786' />
+ <node id='-100077' lat='29.68029' lon='115.11199' />
+ <node id='-100079' lat='29.50176' lon='115.16693' />
+ <node id='-100081' lat='29.55852' lon='114.95063' />
+ <node id='-100083' lat='29.38397' lon='114.88128' />
+ <node id='-100085' lat='29.31993' lon='114.25231' />
+ <node id='-100087' lat='29.21930' lon='114.23034' />
+ <node id='-100089' lat='29.20761' lon='114.05250' />
+ <node id='-100209' lat='34.65354' lon='110.89050' />
+ <node id='-100211' lat='34.81831' lon='111.15760' />
+ <node id='-100213' lat='34.79294' lon='111.22695' />
+ <node id='-100215' lat='34.84649' lon='111.57508' />
+ <node id='-100217' lat='35.07159' lon='111.82228' />
+ <node id='-100219' lat='35.04517' lon='112.03994' />
+ <node id='-100221' lat='35.27981' lon='112.05505' />
+ <node id='-100223' lat='35.20635' lon='112.76916' />
+ <node id='-100225' lat='35.35937' lon='113.02802' />
+ <node id='-100227' lat='35.52943' lon='113.48945' />
+ <node id='-100229' lat='35.67626' lon='113.60961' />
+ <node id='-100231' lat='35.81614' lon='113.57597' />
+ <node id='-100233' lat='35.83507' lon='113.65287' />
+ <node id='-100235' lat='36.36103' lon='113.72909' />
+ <node id='-100237' lat='36.33172' lon='114.02435' />
+ <node id='-100239' lat='36.12345' lon='114.61418' />
+ <node id='-100241' lat='36.13066' lon='114.91287' />
+ <node id='-100243' lat='36.04354' lon='114.91493' />
+ <node id='-100245' lat='36.22544' lon='115.19714' />
+ <node id='-100247' lat='36.07518' lon='115.31936' />
+ <node id='-100249' lat='36.15506' lon='115.48072' />
+ <node id='-100251' lat='36.01078' lon='115.43197' />
+ <node id='-100253' lat='35.95021' lon='115.35026' />
+ <node id='-100255' lat='35.77771' lon='115.35644' />
+ <node id='-100259' lat='35.92297' lon='115.49171' />
+ <node id='-100261' lat='35.91936' lon='115.64414' />
+ <node id='-100263' lat='36.11069' lon='116.09390' />
+ <node id='-100265' lat='35.96300' lon='116.03073' />
+ <node id='-100267' lat='35.91185' lon='115.87005' />
+ <node id='-100269' lat='35.76211' lon='115.67985' />
+ <node id='-100271' lat='35.64111' lon='115.41206' />
+ <node id='-100273' lat='35.47744' lon='115.32966' />
+ <node id='-100275' lat='35.40416' lon='115.07903' />
+ <node id='-100277' lat='35.19962' lon='114.91218' />
+ <node id='-100279' lat='34.99400' lon='114.82429' />
+ <node id='-100281' lat='35.00187' lon='115.13122' />
+ <node id='-100283' lat='34.94814' lon='115.21465' />
+ <node id='-100285' lat='34.90817' lon='115.19439' />
+ <node id='-100287' lat='34.80140' lon='115.42545' />
+ <node id='-100289' lat='34.63659' lon='115.45394' />
+ <node id='-100291' lat='34.55577' lon='115.67916' />
+ <node id='-100293' lat='34.60665' lon='116.09596' />
+ <node id='-100295' lat='34.51759' lon='116.19792' />
+ <node id='-100297' lat='34.37177' lon='116.24290' />
+ <node id='-100299' lat='34.27537' lon='116.57867' />
+ <node id='-100301' lat='34.09588' lon='116.53266' />
+ <node id='-100303' lat='33.96585' lon='116.64974' />
+ <node id='-100305' lat='33.88580' lon='116.63806' />
+ <node id='-100307' lat='33.72148' lon='116.22951' />
+ <node id='-100309' lat='33.71148' lon='116.14986' />
+ <node id='-100311' lat='33.83563' lon='116.03176' />
+ <node id='-100313' lat='33.85787' lon='116.05545' />
+ <node id='-100315' lat='33.90376' lon='115.96034' />
+ <node id='-100317' lat='33.97439' lon='115.99845' />
+ <node id='-100319' lat='34.07598' lon='115.76431' />
+ <node id='-100321' lat='34.02563' lon='115.59059' />
+ <node id='-100323' lat='33.88210' lon='115.54801' />
+ <node id='-100325' lat='33.57115' lon='115.62286' />
+ <node id='-100327' lat='33.51850' lon='115.34957' />
+ <node id='-100329' lat='33.20709' lon='115.30769' />
+ <node id='-100331' lat='33.08348' lon='115.13465' />
+ <node id='-100333' lat='33.14387' lon='114.91287' />
+ <node id='-100335' lat='32.97295' lon='114.88128' />
+ <node id='-100337' lat='32.84844' lon='115.20675' />
+ <node id='-100339' lat='32.59946' lon='115.18890' />
+ <node id='-100341' lat='32.53813' lon='115.44982' />
+ <node id='-100343' lat='32.38634' lon='115.56312' />
+ <node id='-100345' lat='32.57922' lon='115.91812' />
+ <node id='-100347' lat='32.45705' lon='115.86181' />
+ <node id='-100349' lat='32.06861' lon='115.93872' />
+ <node id='-100351' lat='31.77195' lon='115.87005' />
+ <node id='-100353' lat='31.76145' lon='115.64002' />
+ <node id='-100355' lat='31.65045' lon='115.47180' />
+ <node id='-100357' lat='31.40228' lon='115.36165' />
+ <node id='-100398' lat='38.26514' lon='117.84484' />
+ <node id='-100400' lat='38.07296' lon='117.69378' />
+ <node id='-100402' lat='38.06323' lon='117.55439' />
+ <node id='-100404' lat='37.83636' lon='117.40745' />
+ <node id='-100406' lat='37.84015' lon='116.79153' />
+ <node id='-100408' lat='37.46995' lon='116.42143' />
+ <node id='-100410' lat='37.58485' lon='116.31912' />
+ <node id='-100412' lat='37.46177' lon='116.21887' />
+ <node id='-100414' lat='37.35978' lon='116.23466' />
+ <node id='-100416' lat='37.33304' lon='115.96755' />
+ <node id='-100418' lat='37.04750' lon='115.83366' />
+ <node id='-100420' lat='36.79828' lon='115.62629' />
+ <node id='-100422' lat='36.75759' lon='115.47866' />
+ <node id='-100424' lat='36.47927' lon='115.27336' />
+ <node id='-100449' lat='34.64676' lon='116.37405' />
+ <node id='-100451' lat='34.89944' lon='116.43859' />
+ <node id='-100453' lat='34.88367' lon='116.96456' />
+ <node id='-100455' lat='34.52692' lon='117.15957' />
+ <node id='-100457' lat='34.51447' lon='117.78991' />
+ <node id='-100459' lat='34.68404' lon='117.93411' />
+ <node id='-100461' lat='34.54389' lon='118.14559' />
+ <node id='-100463' lat='34.36837' lon='118.17718' />
+ <node id='-100465' lat='34.44655' lon='118.42849' />
+ <node id='-100467' lat='34.69194' lon='118.51226' />
+ <node id='-100469' lat='34.73822' lon='118.76495' />
+ <node id='-100471' lat='35.04349' lon='118.88442' />
+ <node id='-100473' lat='35.07833' lon='119.30259' />
+ <node id='-100490' lat='25.22544' lon='115.86250' />
+ <node id='-100492' lat='25.32789' lon='116.00601' />
+ <node id='-100494' lat='25.87899' lon='116.14265' />
+ <node id='-100496' lat='25.97100' lon='116.36444' />
+ <node id='-100498' lat='26.15728' lon='116.50039' />
+ <node id='-100500' lat='26.23368' lon='116.38572' />
+ <node id='-100502' lat='26.49024' lon='116.64321' />
+ <node id='-100504' lat='26.70145' lon='116.51412' />
+ <node id='-100506' lat='26.92513' lon='116.60476' />
+ <node id='-100508' lat='27.10620' lon='117.05451' />
+ <node id='-100510' lat='27.29430' lon='117.16918' />
+ <node id='-100512' lat='27.66163' lon='117.01469' />
+ <node id='-100514' lat='27.76801' lon='117.31269' />
+ <node id='-100516' lat='27.87671' lon='117.28523' />
+ <node id='-100518' lat='27.96408' lon='117.56332' />
+ <node id='-100520' lat='27.82268' lon='117.67249' />
+ <node id='-100522' lat='27.83027' lon='117.75180' />
+ <node id='-100524' lat='27.94891' lon='117.85274' />
+ <node id='-100526' lat='27.99167' lon='118.08792' />
+ <node id='-100528' lat='28.05743' lon='118.16413' />
+ <node id='-100530' lat='28.09409' lon='118.35296' />
+ <node id='-100532' lat='28.19369' lon='118.36875' />
+ <node id='-100534' lat='28.22878' lon='118.31245' />
+ <node id='-100536' lat='28.32856' lon='118.48308' />
+ <node id='-100538' lat='28.41193' lon='118.43364' />
+ <node id='-100540' lat='28.47925' lon='118.47381' />
+ <node id='-100542' lat='28.57457' lon='118.40343' />
+ <node id='-100544' lat='28.68486' lon='118.42540' />
+ <node id='-100546' lat='28.81640' lon='118.35090' />
+ <node id='-100548' lat='28.92523' lon='118.25134' />
+ <node id='-100550' lat='29.10057' lon='118.03230' />
+ <node id='-100552' lat='29.28520' lon='118.07281' />
+ <node id='-100554' lat='29.48503' lon='118.33717' />
+ <node id='-100556' lat='29.52447' lon='118.48548' />
+ <node id='-100558' lat='29.76258' lon='118.75808' />
+ <node id='-100560' lat='30.02332' lon='118.89816' />
+ <node id='-100562' lat='30.16709' lon='118.85627' />
+ <node id='-100564' lat='29.38178' lon='118.20052' />
+ <node id='-100569' lat='29.42853' lon='118.11950' />
+ <node id='-100573' lat='29.53523' lon='118.12705' />
+ <node id='-100575' lat='29.55852' lon='117.69584' />
+ <node id='-100577' lat='29.69222' lon='117.45483' />
+ <node id='-100579' lat='29.89899' lon='117.24952' />
+ <node id='-100581' lat='29.82634' lon='117.06893' />
+ <node id='-100583' lat='29.69759' lon='117.09091' />
+ <node id='-100585' lat='29.58301' lon='116.70913' />
+ <node id='-100587' lat='29.70117' lon='116.64939' />
+ <node id='-100589' lat='29.94541' lon='116.91993' />
+ <node id='-100591' lat='30.06077' lon='116.74278' />
+ <node id='-100593' lat='30.04769' lon='116.57936' />
+ <node id='-100595' lat='29.89899' lon='116.52992' />
+ <node id='-100689' lat='26.87870' lon='121.03532' />
+ <node id='-100692' lat='27.17219' lon='120.43281' />
+ <node id='-100694' lat='27.20273' lon='120.40603' />
+ <node id='-100696' lat='27.26531' lon='120.42011' />
+ <node id='-100698' lat='27.43089' lon='120.25909' />
+ <node id='-100700' lat='27.42053' lon='120.13275' />
+ <node id='-100702' lat='27.34371' lon='120.03662' />
+ <node id='-100704' lat='27.30741' lon='119.76985' />
+ <node id='-100706' lat='27.53810' lon='119.65999' />
+ <node id='-100708' lat='27.67988' lon='119.61845' />
+ <node id='-100710' lat='27.43425' lon='119.25247' />
+ <node id='-100712' lat='27.44186' lon='119.12132' />
+ <node id='-100714' lat='27.47294' lon='118.89541' />
+ <node id='-100716' lat='27.64643' lon='118.89678' />
+ <node id='-100718' lat='27.94164' lon='118.79722' />
+ <node id='-100720' lat='27.98773' lon='118.71002' />
+ <node id='-100722' lat='28.24572' lon='118.79035' />
+ <node id='-100724' lat='28.28594' lon='118.53973' />
+ <node id='-100726' lat='28.23876' lon='118.47759' />
+ <node id='-100728' lat='28.29239' lon='118.42121' />
+ <node id='-100793' lat='30.20508' lon='118.90914' />
+ <node id='-100795' lat='30.35391' lon='118.89404' />
+ <node id='-100797' lat='30.28871' lon='119.22912' />
+ <node id='-100799' lat='30.37761' lon='119.38705' />
+ <node id='-100801' lat='30.53032' lon='119.31152' />
+ <node id='-100803' lat='30.53062' lon='119.23393' />
+ <node id='-100805' lat='30.61575' lon='119.24663' />
+ <node id='-100807' lat='30.69018' lon='119.38671' />
+ <node id='-100809' lat='30.64145' lon='119.43134' />
+ <node id='-100811' lat='30.85743' lon='119.57382' />
+ <node id='-100813' lat='30.97407' lon='119.58412' />
+ <node id='-100815' lat='31.13290' lon='119.63149' />
+ <node id='-100817' lat='31.11174' lon='119.57656' />
+ <node id='-100819' lat='31.16110' lon='119.50378' />
+ <node id='-100821' lat='31.19107' lon='119.36782' />
+ <node id='-100823' lat='31.30143' lon='119.35134' />
+ <node id='-100825' lat='31.25272' lon='119.27238' />
+ <node id='-100827' lat='31.29908' lon='119.17968' />
+ <node id='-100829' lat='31.23394' lon='119.07257' />
+ <node id='-100831' lat='31.23394' lon='118.78761' />
+ <node id='-100833' lat='31.29967' lon='118.71482' />
+ <node id='-100835' lat='31.43745' lon='118.86314' />
+ <node id='-100837' lat='31.62415' lon='118.86520' />
+ <node id='-100839' lat='31.67851' lon='118.73954' />
+ <node id='-100841' lat='31.62415' lon='118.71894' />
+ <node id='-100843' lat='31.64812' lon='118.64204' />
+ <node id='-100845' lat='31.71940' lon='118.69354' />
+ <node id='-100847' lat='31.78246' lon='118.47587' />
+ <node id='-100849' lat='31.84373' lon='118.49716' />
+ <node id='-100851' lat='31.93788' lon='118.35605' />
+ <node id='-100853' lat='32.02612' lon='118.39004' />
+ <node id='-100855' lat='32.14393' lon='118.50128' />
+ <node id='-100857' lat='32.19479' lon='118.50299' />
+ <node id='-100859' lat='32.21657' lon='118.64444' />
+ <node id='-100861' lat='32.36198' lon='118.69560' />
+ <node id='-100863' lat='32.45647' lon='118.68049' />
+ <node id='-100865' lat='32.58442' lon='118.54659' />
+ <node id='-100867' lat='32.58905' lon='118.89747' />
+ <node id='-100869' lat='32.45531' lon='119.08218' />
+ <node id='-100871' lat='32.60756' lon='119.22225' />
+ <node id='-100873' lat='32.83286' lon='119.17762' />
+ <node id='-100875' lat='32.95855' lon='118.85559' />
+ <node id='-100877' lat='32.71624' lon='118.70590' />
+ <node id='-100879' lat='32.72144' lon='118.37425' />
+ <node id='-100881' lat='32.93320' lon='118.22456' />
+ <node id='-100883' lat='33.22030' lon='118.20121' />
+ <node id='-100885' lat='33.12777' lon='118.03024' />
+ <node id='-100887' lat='33.33052' lon='117.96775' />
+ <node id='-100889' lat='33.74546' lon='118.18405' />
+ <node id='-100891' lat='33.74718' lon='117.71026' />
+ <node id='-100893' lat='33.89264' lon='117.74322' />
+ <node id='-100895' lat='34.06176' lon='117.50907' />
+ <node id='-100897' lat='34.15556' lon='117.02567' />
+ <node id='-100899' lat='34.39841' lon='116.95014' />
+ <node id='-100972' lat='30.68516' lon='121.26434' />
+ <node id='-100974' lat='30.78726' lon='121.21456' />
+ <node id='-100976' lat='30.78018' lon='121.12152' />
+ <node id='-100978' lat='30.86509' lon='121.12529' />
+ <node id='-100980' lat='30.82265' lon='121.03122' />
+ <node id='-100982' lat='30.89603' lon='120.98865' />
+ <node id='-100984' lat='31.01939' lon='120.98659' />
+ <node id='-100986' lat='31.01822' lon='120.89424' />
+ <node id='-100988' lat='30.99173' lon='120.84754' />
+ <node id='-100990' lat='30.99880' lon='120.77030' />
+ <node id='-100992' lat='30.96289' lon='120.73459' />
+ <node id='-100994' lat='30.95700' lon='120.67485' />
+ <node id='-100996' lat='30.88572' lon='120.70747' />
+ <node id='-100998' lat='30.85095' lon='120.64739' />
+ <node id='-101000' lat='30.85566' lon='120.58010' />
+ <node id='-101002' lat='30.75953' lon='120.49873' />
+ <node id='-101004' lat='30.91459' lon='120.42835' />
+ <node id='-101006' lat='30.88896' lon='120.35007' />
+ <node id='-101008' lat='30.97054' lon='120.36208' />
+ <node id='-101010' lat='31.17051' lon='119.91439' />
+ <node id='-101074' lat='31.09028' lon='120.89836' />
+ <node id='-101076' lat='31.10938' lon='120.85475' />
+ <node id='-101078' lat='31.14083' lon='120.88325' />
+ <node id='-101080' lat='31.14171' lon='121.03671' />
+ <node id='-101082' lat='31.16345' lon='121.07276' />
+ <node id='-101084' lat='31.23658' lon='121.05903' />
+ <node id='-101086' lat='31.27356' lon='121.06006' />
+ <node id='-101088' lat='31.28529' lon='121.11808' />
+ <node id='-101090' lat='31.27752' lon='121.14950' />
+ <node id='-101092' lat='31.28515' lon='121.15722' />
+ <node id='-101094' lat='31.31038' lon='121.14057' />
+ <node id='-101096' lat='31.30348' lon='121.12581' />
+ <node id='-101098' lat='31.37459' lon='121.11173' />
+ <node id='-101100' lat='31.41108' lon='121.15447' />
+ <node id='-101102' lat='31.44492' lon='121.14246' />
+ <node id='-101104' lat='31.49704' lon='121.23722' />
+ <node id='-101106' lat='31.47933' lon='121.25335' />
+ <node id='-101108' lat='31.54723' lon='121.38210' />
+ <node id='-101110' lat='31.75853' lon='121.09954' />
+ <node id='-101112' lat='31.88338' lon='121.30554' />
+ <node id='-101114' lat='31.76086' lon='121.44286' />
+ <node id='-101116' lat='31.63818' lon='121.76147' />
+ <node id='-101118' lat='31.76513' lon='122.29378' />
+ <node id='-101340' lat='40.51327' lon='114.28527' />
+ <node id='-101342' lat='40.36695' lon='114.30519' />
+ <node id='-101344' lat='40.33660' lon='114.54482' />
+ <node id='-101346' lat='40.01920' lon='113.89114' />
+ <node id='-101348' lat='39.83121' lon='114.41093' />
+ <node id='-101350' lat='39.60568' lon='114.39376' />
+ <node id='-101352' lat='39.55276' lon='114.56130' />
+ <node id='-101354' lat='39.07997' lon='114.34020' />
+ <node id='-101356' lat='39.09489' lon='113.94676' />
+ <node id='-101358' lat='38.94499' lon='113.75518' />
+ <node id='-101360' lat='38.76854' lon='113.84101' />
+ <node id='-101362' lat='38.50787' lon='113.53683' />
+ <node id='-101364' lat='38.23871' lon='113.55194' />
+ <node id='-101366' lat='38.16263' lon='113.82797' />
+ <node id='-101368' lat='37.72972' lon='114.02984' />
+ <node id='-101372' lat='37.69387' lon='114.12700' />
+ <node id='-101374' lat='37.58594' lon='114.09851' />
+ <node id='-101376' lat='37.07380' lon='113.74488' />
+ <node id='-101378' lat='36.88071' lon='113.78917' />
+ <node id='-101380' lat='36.69760' lon='113.47297' />
+ <node id='-101382' lat='36.46160' lon='113.59554' />
+ <node id='-101433' lat='38.49229' lon='118.33648' />
+ <node id='-101435' lat='38.61472' lon='117.59559' />
+ <node id='-101437' lat='38.61204' lon='117.42736' />
+ <node id='-101439' lat='38.56373' lon='117.24128' />
+ <node id='-101441' lat='38.63189' lon='117.21931' />
+ <node id='-101443' lat='38.58682' lon='117.09297' />
+ <node id='-101445' lat='38.69837' lon='117.02567' />
+ <node id='-101447' lat='38.68658' lon='116.87187' />
+ <node id='-101449' lat='38.74658' lon='116.85539' />
+ <node id='-101451' lat='38.74176' lon='116.75514' />
+ <node id='-101453' lat='38.93751' lon='116.70364' />
+ <node id='-101455' lat='39.04372' lon='116.75926' />
+ <node id='-101457' lat='39.05598' lon='116.85882' />
+ <node id='-101459' lat='39.13112' lon='116.91581' />
+ <node id='-101461' lat='39.16467' lon='116.85539' />
+ <node id='-101463' lat='39.34385' lon='116.87942' />
+ <node id='-101465' lat='39.34491' lon='116.81899' />
+ <node id='-101467' lat='39.43354' lon='116.87049' />
+ <node id='-101469' lat='39.46005' lon='116.77848' />
+ <node id='-101471' lat='39.61415' lon='116.80732' />
+ <node id='-101473' lat='39.59193' lon='116.52065' />
+ <node id='-101475' lat='39.52946' lon='116.46366' />
+ <node id='-101477' lat='39.44494' lon='116.43722' />
+ <node id='-101479' lat='39.45660' lon='116.32942' />
+ <node id='-101481' lat='39.51649' lon='116.23809' />
+ <node id='-101483' lat='39.57870' lon='116.22058' />
+ <node id='-101485' lat='39.57552' lon='115.91365' />
+ <node id='-101487' lat='39.50933' lon='115.81031' />
+ <node id='-101489' lat='39.51251' lon='115.74851' />
+ <node id='-101491' lat='39.60833' lon='115.66268' />
+ <node id='-101493' lat='39.60410' lon='115.51574' />
+ <node id='-101495' lat='39.74177' lon='115.47042' />
+ <node id='-101497' lat='39.77925' lon='115.41755' />
+ <node id='-101499' lat='39.81011' lon='115.56518' />
+ <node id='-101501' lat='39.96449' lon='115.42098' />
+ <node id='-101503' lat='40.07649' lon='115.50338' />
+ <node id='-101505' lat='40.15736' lon='115.76808' />
+ <node id='-101507' lat='40.14633' lon='115.84670' />
+ <node id='-101509' lat='40.27481' lon='115.95382' />
+ <node id='-101511' lat='40.35544' lon='115.90541' />
+ <node id='-101513' lat='40.36145' lon='115.85700' />
+ <node id='-101515' lat='40.44668' lon='115.76568' />
+ <node id='-101517' lat='40.46196' lon='115.77632' />
+ <node id='-101519' lat='40.51145' lon='115.73272' />
+ <node id='-101521' lat='40.56128' lon='115.77907' />
+ <node id='-101523' lat='40.55750' lon='115.81615' />
+ <node id='-101525' lat='40.58710' lon='115.82267' />
+ <node id='-101527' lat='40.62646' lon='116.11278' />
+ <node id='-101529' lat='40.79067' lon='116.24565' />
+ <node id='-101531' lat='40.76520' lon='116.46537' />
+ <node id='-101533' lat='40.93037' lon='116.31465' />
+ <node id='-101535' lat='40.89586' lon='116.47602' />
+ <node id='-101537' lat='40.98145' lon='116.44306' />
+ <node id='-101539' lat='40.97989' lon='116.62090' />
+ <node id='-101541' lat='41.06485' lon='116.62605' />
+ <node id='-101543' lat='40.68896' lon='116.98379' />
+ <node id='-101545' lat='40.69938' lon='117.21794' />
+ <node id='-101547' lat='40.65199' lon='117.30789' />
+ <node id='-101549' lat='40.68532' lon='117.43972' />
+ <node id='-101551' lat='40.65069' lon='117.51663' />
+ <node id='-101553' lat='40.63167' lon='117.47749' />
+ <node id='-101555' lat='40.65042' lon='117.44419' />
+ <node id='-101557' lat='40.61851' lon='117.42977' />
+ <node id='-101559' lat='40.63701' lon='117.41432' />
+ <node id='-101561' lat='40.56206' lon='117.40882' />
+ <node id='-101563' lat='40.57719' lon='117.30720' />
+ <node id='-101565' lat='40.54902' lon='117.24781' />
+ <node id='-101567' lat='40.50857' lon='117.25227' />
+ <node id='-101569' lat='40.50126' lon='117.20626' />
+ <node id='-101571' lat='40.43701' lon='117.25913' />
+ <node id='-101573' lat='40.41245' lon='117.22824' />
+ <node id='-101575' lat='40.36616' lon='117.21811' />
+ <node id='-101577' lat='40.27612' lon='117.29587' />
+ <node id='-101579' lat='40.28790' lon='117.32814' />
+ <node id='-101581' lat='40.23131' lon='117.34291' />
+ <node id='-101583' lat='40.22607' lon='117.55370' />
+ <node id='-101585' lat='40.05389' lon='117.75558' />
+ <node id='-101587' lat='39.96659' lon='117.78648' />
+ <node id='-101589' lat='39.98711' lon='117.53517' />
+ <node id='-101591' lat='39.88971' lon='117.50427' />
+ <node id='-101593' lat='39.75840' lon='117.54753' />
+ <node id='-101595' lat='39.73993' lon='117.58872' />
+ <node id='-101597' lat='39.63848' lon='117.65945' />
+ <node id='-101599' lat='39.52787' lon='117.71026' />
+ <node id='-101601' lat='39.59828' lon='117.76245' />
+ <node id='-101603' lat='39.57499' lon='117.92861' />
+ <node id='-101605' lat='39.38685' lon='117.85274' />
+ <node id='-101607' lat='39.36668' lon='117.79197' />
+ <node id='-101609' lat='39.35421' lon='117.84656' />
+ <node id='-101611' lat='39.32712' lon='117.84072' />
+ <node id='-101613' lat='39.31331' lon='117.96363' />
+ <node id='-101615' lat='39.25166' lon='118.06079' />
+ <node id='-101617' lat='39.21789' lon='118.02577' />
+ <node id='-101619' lat='38.73266' lon='118.35983' />
+ <node id='-101621' lat='39.77661' lon='119.98931' />
+ <node id='-101731' lat='40.17362' lon='117.40608' />
+ <node id='-101733' lat='40.07281' lon='117.19425' />
+ <node id='-101735' lat='39.87970' lon='117.13897' />
+ <node id='-101737' lat='39.83385' lon='117.26154' />
+ <node id='-101739' lat='39.81723' lon='117.14755' />
+ <node id='-101741' lat='39.75999' lon='117.19493' />
+ <node id='-101743' lat='39.61203' lon='117.14137' />
+ <node id='-101745' lat='39.65434' lon='116.95083' />
+ <node id='-101747' lat='39.69714' lon='116.89075' />
<way id='-28848'>
<nd ref='-11546' />
<nd ref='-5746' />
@@ -15975,7 +18979,6 @@
<nd ref='-7840' />
<nd ref='-21466' />
<nd ref='-21470' />
- <nd ref='-21468' />
<nd ref='-7838' />
<nd ref='-6260' />
<nd ref='-21756' />
@@ -18075,9 +21078,11 @@
<nd ref='-7024' />
<nd ref='-19564' />
<nd ref='-19566' />
+ <nd ref='-98299' />
<nd ref='-19572' />
<nd ref='-19570' />
<nd ref='-19568' />
+ <nd ref='-98413' />
<nd ref='-7026' />
<nd ref='-19574' />
<nd ref='-7028' />
@@ -18100,7 +21105,7 @@
<nd ref='-19604' />
<nd ref='-19606' />
<nd ref='-7034' />
- <nd ref='-27416' />
+ <nd ref='-98580' />
<nd ref='-19608' />
<nd ref='-7036' />
<nd ref='-7038' />
@@ -19384,6 +22389,7 @@
<nd ref='-7332' />
<nd ref='-27462' />
<nd ref='-2162' />
+ <nd ref='-94057' />
<nd ref='-27468' />
<nd ref='-27472' />
<nd ref='-27464' />
@@ -20005,7 +23011,7 @@
<tag k='ISO3166-1:alpha2' v='CA' />
<tag k='name:en' v='Canada' />
</way>
- <way id='-28974' action='modify'>
+ <way id='-28974'>
<nd ref='-13006' />
<nd ref='-13008' />
<nd ref='-7714' />
@@ -20137,6 +23143,7 @@
<nd ref='-27302' />
<nd ref='-12854' />
<nd ref='-12852' />
+ <nd ref='-90502' />
<nd ref='-12850' />
<nd ref='-27304' />
<nd ref='-7752' />
@@ -20148,7 +23155,9 @@
<nd ref='-10870' />
<nd ref='-11932' />
<nd ref='-11930' />
+ <nd ref='-101118' />
<nd ref='-11942' />
+ <nd ref='-100689' />
<nd ref='-11944' />
<nd ref='-7756' />
<nd ref='-11948' />
@@ -20157,6 +23166,7 @@
<nd ref='-7762' />
<nd ref='-11946' />
<nd ref='-7764' />
+ <nd ref='-99504' />
<nd ref='-11958' />
<nd ref='-11960' />
<nd ref='-11962' />
@@ -20558,8 +23568,6 @@
<nd ref='-1804' />
<nd ref='-1814' />
<nd ref='-1816' />
- <nd ref='-1810' />
- <nd ref='-1812' />
<nd ref='-1818' />
<nd ref='-1820' />
<nd ref='-1822' />
@@ -20649,28 +23657,19 @@
<nd ref='-22182' />
<nd ref='-22184' />
<nd ref='-22186' />
- <nd ref='-22188' />
<nd ref='-22190' />
<nd ref='-22192' />
<nd ref='-22196' />
<nd ref='-22194' />
<nd ref='-7828' />
- <nd ref='-22180' />
- <nd ref='-22174' />
<nd ref='-22178' />
- <nd ref='-22176' />
<nd ref='-22172' />
- <nd ref='-22170' />
<nd ref='-22166' />
<nd ref='-22168' />
<nd ref='-7830' />
- <nd ref='-22162' />
<nd ref='-22164' />
<nd ref='-22160' />
- <nd ref='-22158' />
<nd ref='-22152' />
- <nd ref='-22154' />
- <nd ref='-22156' />
<nd ref='-22150' />
<nd ref='-22148' />
<nd ref='-7832' />
@@ -20678,20 +23677,15 @@
<nd ref='-21480' />
<nd ref='-21474' />
<nd ref='-21476' />
- <nd ref='-21472' />
<nd ref='-7834' />
<nd ref='-21486' />
- <nd ref='-21488' />
<nd ref='-21484' />
<nd ref='-21482' />
<nd ref='-7836' />
- <nd ref='-21494' />
- <nd ref='-21496' />
<nd ref='-21492' />
<nd ref='-21490' />
<nd ref='-21498' />
<nd ref='-7838' />
- <nd ref='-21468' />
<nd ref='-21470' />
<nd ref='-21466' />
<nd ref='-7840' />
@@ -26005,18 +28999,13 @@
<nd ref='-7830' />
<nd ref='-22168' />
<nd ref='-22166' />
- <nd ref='-22170' />
<nd ref='-22172' />
- <nd ref='-22176' />
<nd ref='-22178' />
- <nd ref='-22174' />
- <nd ref='-22180' />
<nd ref='-7828' />
<nd ref='-22194' />
<nd ref='-22196' />
<nd ref='-22192' />
<nd ref='-22190' />
- <nd ref='-22188' />
<nd ref='-22186' />
<nd ref='-22184' />
<nd ref='-22182' />
@@ -26155,8 +29144,6 @@
<nd ref='-1740' />
<nd ref='-1724' />
<nd ref='-1728' />
- <nd ref='-1730' />
- <nd ref='-1726' />
<nd ref='-27496' />
<nd ref='-1736' />
<nd ref='-1734' />
@@ -26191,6 +29178,8 @@
<nd ref='-27478' />
<nd ref='-1792' />
<nd ref='-1798' />
+ <nd ref='-94092' />
+ <nd ref='-92828' />
<nd ref='-1786' />
<nd ref='-1788' />
<nd ref='-1784' />
@@ -26218,6 +29207,7 @@
<nd ref='-27464' />
<nd ref='-27472' />
<nd ref='-27468' />
+ <nd ref='-94057' />
<nd ref='-2162' />
<nd ref='-27462' />
<nd ref='-7332' />
@@ -26302,16 +29292,11 @@
<nd ref='-22036' />
<nd ref='-22034' />
<nd ref='-9290' />
- <nd ref='-22032' />
- <nd ref='-9292' />
- <nd ref='-22028' />
- <nd ref='-22030' />
<nd ref='-22026' />
<nd ref='-22024' />
<nd ref='-22010' />
<nd ref='-22012' />
<nd ref='-22020' />
- <nd ref='-22022' />
<nd ref='-22018' />
<nd ref='-22016' />
<nd ref='-22014' />
@@ -26319,7 +29304,6 @@
<nd ref='-27410' />
<nd ref='-22008' />
<nd ref='-9296' />
- <nd ref='-22006' />
<nd ref='-22004' />
<nd ref='-22002' />
<nd ref='-9298' />
@@ -26371,6 +29355,7 @@
<nd ref='-7038' />
<nd ref='-7036' />
<nd ref='-19608' />
+ <nd ref='-98580' />
<nd ref='-7034' />
<nd ref='-19606' />
<nd ref='-19604' />
@@ -26393,9 +29378,11 @@
<nd ref='-7028' />
<nd ref='-19574' />
<nd ref='-7026' />
+ <nd ref='-98413' />
<nd ref='-19568' />
<nd ref='-19570' />
<nd ref='-19572' />
+ <nd ref='-98299' />
<nd ref='-19566' />
<nd ref='-19564' />
<nd ref='-7024' />
@@ -26498,8 +29485,11 @@
<nd ref='-9312' />
<nd ref='-11714' />
<nd ref='-9314' />
+ <nd ref='-90878' />
<nd ref='-11796' />
<nd ref='-11794' />
+ <nd ref='-93205' />
+ <nd ref='-96157' />
<nd ref='-9316' />
<nd ref='-9318' />
<nd ref='-9320' />
@@ -26545,13 +29535,9 @@
<nd ref='-9342' />
<nd ref='-22306' />
<nd ref='-22308' />
- <nd ref='-9344' />
<nd ref='-22312' />
- <nd ref='-22314' />
- <nd ref='-22310' />
<nd ref='-9346' />
<nd ref='-9348' />
- <nd ref='-9350' />
<nd ref='-9352' />
<nd ref='-9354' />
<nd ref='-9356' />
@@ -26657,13 +29643,9 @@
<nd ref='-7832' />
<nd ref='-22148' />
<nd ref='-22150' />
- <nd ref='-22156' />
- <nd ref='-22154' />
<nd ref='-22152' />
- <nd ref='-22158' />
<nd ref='-22160' />
<nd ref='-22164' />
- <nd ref='-22162' />
<nd ref='-7830' />
<tag k='ISO3166-1:alpha2' v='IN' />
<tag k='driving_side' v='left' />
@@ -30069,7 +33051,6 @@
<nd ref='-9298' />
<nd ref='-22002' />
<nd ref='-22004' />
- <nd ref='-22006' />
<nd ref='-9296' />
<nd ref='-22008' />
<nd ref='-27410' />
@@ -30077,16 +33058,11 @@
<nd ref='-22014' />
<nd ref='-22016' />
<nd ref='-22018' />
- <nd ref='-22022' />
<nd ref='-22020' />
<nd ref='-22012' />
<nd ref='-22010' />
<nd ref='-22024' />
<nd ref='-22026' />
- <nd ref='-22030' />
- <nd ref='-22028' />
- <nd ref='-9292' />
- <nd ref='-22032' />
<nd ref='-9290' />
<nd ref='-22034' />
<nd ref='-22036' />
@@ -31732,6 +34708,8 @@
<nd ref='-1784' />
<nd ref='-1788' />
<nd ref='-1786' />
+ <nd ref='-92828' />
+ <nd ref='-94092' />
<nd ref='-1798' />
<nd ref='-1792' />
<nd ref='-27478' />
@@ -31920,8 +34898,6 @@
<nd ref='-1822' />
<nd ref='-1820' />
<nd ref='-1818' />
- <nd ref='-1812' />
- <nd ref='-1810' />
<nd ref='-1816' />
<nd ref='-1814' />
<nd ref='-1804' />
@@ -32022,10 +34998,8 @@
<nd ref='-7836' />
<nd ref='-21482' />
<nd ref='-21484' />
- <nd ref='-21488' />
<nd ref='-21486' />
<nd ref='-7834' />
- <nd ref='-21472' />
<nd ref='-21476' />
<nd ref='-21474' />
<nd ref='-21480' />
@@ -32133,13 +35107,9 @@
<nd ref='-9356' />
<nd ref='-9354' />
<nd ref='-9352' />
- <nd ref='-9350' />
<nd ref='-9348' />
<nd ref='-9346' />
- <nd ref='-22310' />
- <nd ref='-22314' />
<nd ref='-22312' />
- <nd ref='-9344' />
<nd ref='-22308' />
<nd ref='-22306' />
<nd ref='-9342' />
@@ -32321,8 +35291,6 @@
<nd ref='-21498' />
<nd ref='-21490' />
<nd ref='-21492' />
- <nd ref='-21496' />
- <nd ref='-21494' />
<nd ref='-7836' />
<tag k='ISO3166-1:alpha2' v='PK' />
<tag k='driving_side' v='left' />
@@ -32915,6 +35883,7 @@
<nd ref='-7752' />
<nd ref='-27304' />
<nd ref='-12850' />
+ <nd ref='-90502' />
<nd ref='-12852' />
<nd ref='-12854' />
<nd ref='-27302' />
@@ -36596,6 +39565,7 @@
<nd ref='-11956' />
<nd ref='-11952' />
<tag k='ISO3166-1:alpha2' v='TW' />
+ <tag k='ISO3166-2' v='CN-71' />
<tag k='name:en' v='Taiwan' />
<tag k='note' v='Self admin.; Claimed by China' />
</way>
@@ -39459,7 +42429,7 @@
<tag k='driving_side' v='left' />
<tag k='name:en' v='Japan' />
</way>
- <way id='-29312' action='modify'>
+ <way id='-29312'>
<nd ref='-10938' />
<nd ref='-27920' />
<nd ref='-27922' />
@@ -40893,6 +43863,7 @@
<nd ref='-22530' />
<nd ref='-22518' />
<tag k='ISO3166-1:alpha2' v='HK' />
+ <tag k='ISO3166-2' v='CN-91' />
<tag k='driving_side' v='left' />
<tag k='name:en' v='Hong Kong' />
</way>
@@ -40964,6 +43935,7 @@
<nd ref='-22610' />
<nd ref='-22582' />
<tag k='ISO3166-1:alpha2' v='MO' />
+ <tag k='ISO3166-2' v='CN-92' />
<tag k='driving_side' v='left' />
<tag k='name:en' v='Macau' />
</way>
@@ -47210,6 +50182,8089 @@
<tag k='ISO3166-1:alpha2' v='SO' />
<tag k='name:en' v='Somalia' />
</way>
+ <way id='-85089'>
+ <nd ref='-22190' />
+ <nd ref='-85088' />
+ <nd ref='-85090' />
+ <nd ref='-85098' />
+ <nd ref='-85100' />
+ <nd ref='-85102' />
+ <nd ref='-85104' />
+ <nd ref='-85106' />
+ <nd ref='-85108' />
+ <nd ref='-85110' />
+ <nd ref='-85112' />
+ <nd ref='-85114' />
+ <nd ref='-85116' />
+ <nd ref='-85118' />
+ <nd ref='-85120' />
+ <nd ref='-85122' />
+ <nd ref='-85124' />
+ <nd ref='-85126' />
+ <nd ref='-85130' />
+ <nd ref='-85132' />
+ <nd ref='-85136' />
+ <nd ref='-85146' />
+ <nd ref='-85150' />
+ <nd ref='-85154' />
+ <nd ref='-85156' />
+ <nd ref='-85160' />
+ <nd ref='-85166' />
+ <nd ref='-85168' />
+ <nd ref='-85172' />
+ <nd ref='-85174' />
+ <nd ref='-85182' />
+ <nd ref='-85184' />
+ <nd ref='-85186' />
+ <nd ref='-85188' />
+ <nd ref='-85196' />
+ <nd ref='-85200' />
+ <nd ref='-85204' />
+ <nd ref='-85206' />
+ <nd ref='-85208' />
+ <nd ref='-85214' />
+ <nd ref='-85216' />
+ <nd ref='-85218' />
+ <nd ref='-85220' />
+ <nd ref='-85222' />
+ <nd ref='-85224' />
+ <nd ref='-85242' />
+ <nd ref='-85244' />
+ <nd ref='-85246' />
+ <nd ref='-85248' />
+ <nd ref='-85250' />
+ <nd ref='-85252' />
+ <nd ref='-85254' />
+ <nd ref='-85256' />
+ <nd ref='-85258' />
+ <nd ref='-85260' />
+ <nd ref='-85262' />
+ <nd ref='-85264' />
+ <nd ref='-85266' />
+ <nd ref='-85268' />
+ <nd ref='-85270' />
+ <nd ref='-85272' />
+ <nd ref='-85274' />
+ <nd ref='-85276' />
+ <nd ref='-85278' />
+ <nd ref='-85284' />
+ <nd ref='-85286' />
+ <nd ref='-85288' />
+ <nd ref='-85290' />
+ <nd ref='-85292' />
+ <nd ref='-85294' />
+ <nd ref='-85298' />
+ <nd ref='-85302' />
+ <nd ref='-85304' />
+ <nd ref='-85308' />
+ <nd ref='-85310' />
+ <nd ref='-85314' />
+ <nd ref='-85318' />
+ <nd ref='-85320' />
+ <nd ref='-85322' />
+ <nd ref='-85326' />
+ <nd ref='-85328' />
+ <nd ref='-85330' />
+ <nd ref='-85334' />
+ <nd ref='-85336' />
+ <nd ref='-85342' />
+ <nd ref='-85344' />
+ <nd ref='-85350' />
+ <nd ref='-85352' />
+ <nd ref='-85354' />
+ <nd ref='-85356' />
+ <nd ref='-85358' />
+ <nd ref='-85364' />
+ <nd ref='-85368' />
+ <nd ref='-85370' />
+ <nd ref='-85372' />
+ <nd ref='-85374' />
+ <nd ref='-85376' />
+ <nd ref='-85378' />
+ <nd ref='-85380' />
+ <nd ref='-85382' />
+ <nd ref='-85384' />
+ <nd ref='-85386' />
+ <nd ref='-85388' />
+ <nd ref='-85390' />
+ <nd ref='-85392' />
+ <nd ref='-85394' />
+ <nd ref='-85396' />
+ <nd ref='-85398' />
+ <nd ref='-85400' />
+ <nd ref='-85402' />
+ <nd ref='-85404' />
+ <nd ref='-85406' />
+ <nd ref='-85408' />
+ <nd ref='-85410' />
+ <nd ref='-85412' />
+ <nd ref='-85414' />
+ <nd ref='-85416' />
+ <nd ref='-85418' />
+ <nd ref='-21942' />
+ <nd ref='-21940' />
+ <nd ref='-21936' />
+ <nd ref='-21938' />
+ <nd ref='-21928' />
+ <nd ref='-21934' />
+ <nd ref='-21932' />
+ <nd ref='-21930' />
+ <nd ref='-7800' />
+ <nd ref='-22082' />
+ <nd ref='-22084' />
+ <nd ref='-22090' />
+ <nd ref='-22088' />
+ <nd ref='-22086' />
+ <nd ref='-22076' />
+ <nd ref='-22078' />
+ <nd ref='-22080' />
+ <nd ref='-22096' />
+ <nd ref='-22094' />
+ <nd ref='-22098' />
+ <nd ref='-22100' />
+ <nd ref='-22102' />
+ <nd ref='-22104' />
+ <nd ref='-22092' />
+ <nd ref='-7802' />
+ <nd ref='-22114' />
+ <nd ref='-22116' />
+ <nd ref='-22112' />
+ <nd ref='-22108' />
+ <nd ref='-22120' />
+ <nd ref='-22118' />
+ <nd ref='-22110' />
+ <nd ref='-22106' />
+ <nd ref='-7804' />
+ <nd ref='-22122' />
+ <nd ref='-22124' />
+ <nd ref='-7806' />
+ <nd ref='-7808' />
+ <nd ref='-22126' />
+ <nd ref='-22128' />
+ <nd ref='-22130' />
+ <nd ref='-7810' />
+ <nd ref='-22136' />
+ <nd ref='-22138' />
+ <nd ref='-22140' />
+ <nd ref='-22146' />
+ <nd ref='-22142' />
+ <nd ref='-22144' />
+ <nd ref='-22134' />
+ <nd ref='-22132' />
+ <nd ref='-7326' />
+ <nd ref='-2178' />
+ <nd ref='-2176' />
+ <nd ref='-2180' />
+ <nd ref='-2182' />
+ <nd ref='-2190' />
+ <nd ref='-2188' />
+ <nd ref='-2186' />
+ <nd ref='-2184' />
+ <nd ref='-2192' />
+ <nd ref='-2194' />
+ <nd ref='-2196' />
+ <nd ref='-2198' />
+ <nd ref='-2200' />
+ <nd ref='-2202' />
+ <nd ref='-2204' />
+ <nd ref='-2206' />
+ <nd ref='-2208' />
+ <nd ref='-7334' />
+ <nd ref='-27540' />
+ <nd ref='-21764' />
+ <nd ref='-21766' />
+ <nd ref='-21760' />
+ <nd ref='-21758' />
+ <nd ref='-21768' />
+ <nd ref='-21762' />
+ <nd ref='-7812' />
+ <nd ref='-10760' />
+ <nd ref='-1808' />
+ <nd ref='-1806' />
+ <nd ref='-1800' />
+ <nd ref='-1802' />
+ <nd ref='-1804' />
+ <nd ref='-1814' />
+ <nd ref='-1816' />
+ <nd ref='-1818' />
+ <nd ref='-1820' />
+ <nd ref='-1822' />
+ <nd ref='-1824' />
+ <nd ref='-1862' />
+ <nd ref='-1848' />
+ <nd ref='-1850' />
+ <nd ref='-1852' />
+ <nd ref='-1854' />
+ <nd ref='-1856' />
+ <nd ref='-1858' />
+ <nd ref='-1842' />
+ <nd ref='-1844' />
+ <nd ref='-1846' />
+ <nd ref='-1860' />
+ <nd ref='-1826' />
+ <nd ref='-1828' />
+ <nd ref='-1830' />
+ <nd ref='-1832' />
+ <nd ref='-1834' />
+ <nd ref='-1838' />
+ <nd ref='-1836' />
+ <nd ref='-1840' />
+ <nd ref='-1920' />
+ <nd ref='-1868' />
+ <nd ref='-1870' />
+ <nd ref='-1872' />
+ <nd ref='-1884' />
+ <nd ref='-1874' />
+ <nd ref='-1876' />
+ <nd ref='-1878' />
+ <nd ref='-1880' />
+ <nd ref='-1882' />
+ <nd ref='-1864' />
+ <nd ref='-1918' />
+ <nd ref='-1866' />
+ <nd ref='-1886' />
+ <nd ref='-1888' />
+ <nd ref='-1890' />
+ <nd ref='-1916' />
+ <nd ref='-1894' />
+ <nd ref='-1892' />
+ <nd ref='-1900' />
+ <nd ref='-1896' />
+ <nd ref='-1898' />
+ <nd ref='-1914' />
+ <nd ref='-1902' />
+ <nd ref='-1904' />
+ <nd ref='-1908' />
+ <nd ref='-1906' />
+ <nd ref='-1910' />
+ <nd ref='-1912' />
+ <nd ref='-10764' />
+ <nd ref='-22242' />
+ <nd ref='-22244' />
+ <nd ref='-22246' />
+ <nd ref='-22240' />
+ <nd ref='-22238' />
+ <nd ref='-22236' />
+ <nd ref='-22234' />
+ <nd ref='-22232' />
+ <nd ref='-22230' />
+ <nd ref='-22228' />
+ <nd ref='-7814' />
+ <nd ref='-22224' />
+ <nd ref='-22226' />
+ <nd ref='-7816' />
+ <nd ref='-27542' />
+ <nd ref='-22218' />
+ <nd ref='-22220' />
+ <nd ref='-22214' />
+ <nd ref='-22216' />
+ <nd ref='-22222' />
+ <nd ref='-22210' />
+ <nd ref='-22212' />
+ <nd ref='-7818' />
+ <nd ref='-7820' />
+ <nd ref='-7822' />
+ <nd ref='-22208' />
+ <nd ref='-22206' />
+ <nd ref='-22204' />
+ <nd ref='-7824' />
+ <nd ref='-22200' />
+ <nd ref='-22202' />
+ <nd ref='-22198' />
+ <nd ref='-7826' />
+ <nd ref='-22182' />
+ <nd ref='-22184' />
+ <nd ref='-22186' />
+ <nd ref='-22190' />
+ <tag k='ISO3166-2' v='CN-54' />
+ <tag k='name:en' v='Tibet' />
+ </way>
+ <way id='-85625'>
+ <nd ref='-85126' />
+ <nd ref='-85624' />
+ <nd ref='-85626' />
+ <nd ref='-85628' />
+ <nd ref='-85630' />
+ <nd ref='-85632' />
+ <nd ref='-85634' />
+ <nd ref='-85636' />
+ <nd ref='-85638' />
+ <nd ref='-85640' />
+ <nd ref='-85642' />
+ <nd ref='-85644' />
+ <nd ref='-85646' />
+ <nd ref='-85648' />
+ <nd ref='-85650' />
+ <nd ref='-85652' />
+ <nd ref='-85654' />
+ <nd ref='-85656' />
+ <nd ref='-85658' />
+ <nd ref='-85660' />
+ <nd ref='-85662' />
+ <nd ref='-85664' />
+ <nd ref='-85666' />
+ <nd ref='-85668' />
+ <nd ref='-85670' />
+ <nd ref='-7904' />
+ <nd ref='-7902' />
+ <nd ref='-7900' />
+ <nd ref='-7898' />
+ <nd ref='-10460' />
+ <nd ref='-7896' />
+ <nd ref='-7894' />
+ <nd ref='-972' />
+ <nd ref='-974' />
+ <nd ref='-976' />
+ <nd ref='-970' />
+ <nd ref='-10462' />
+ <nd ref='-7892' />
+ <nd ref='-10464' />
+ <nd ref='-966' />
+ <nd ref='-27854' />
+ <nd ref='-968' />
+ <nd ref='-964' />
+ <nd ref='-960' />
+ <nd ref='-958' />
+ <nd ref='-962' />
+ <nd ref='-7890' />
+ <nd ref='-946' />
+ <nd ref='-944' />
+ <nd ref='-948' />
+ <nd ref='-950' />
+ <nd ref='-952' />
+ <nd ref='-954' />
+ <nd ref='-956' />
+ <nd ref='-10466' />
+ <nd ref='-934' />
+ <nd ref='-932' />
+ <nd ref='-936' />
+ <nd ref='-938' />
+ <nd ref='-940' />
+ <nd ref='-942' />
+ <nd ref='-7888' />
+ <nd ref='-10468' />
+ <nd ref='-10470' />
+ <nd ref='-14860' />
+ <nd ref='-14862' />
+ <nd ref='-7886' />
+ <nd ref='-7884' />
+ <nd ref='-14974' />
+ <nd ref='-14972' />
+ <nd ref='-14970' />
+ <nd ref='-14968' />
+ <nd ref='-14966' />
+ <nd ref='-27852' />
+ <nd ref='-14958' />
+ <nd ref='-14956' />
+ <nd ref='-14962' />
+ <nd ref='-14964' />
+ <nd ref='-14960' />
+ <nd ref='-14954' />
+ <nd ref='-14952' />
+ <nd ref='-14950' />
+ <nd ref='-14948' />
+ <nd ref='-14946' />
+ <nd ref='-14944' />
+ <nd ref='-14942' />
+ <nd ref='-14940' />
+ <nd ref='-14938' />
+ <nd ref='-27850' />
+ <nd ref='-14936' />
+ <nd ref='-7882' />
+ <nd ref='-7880' />
+ <nd ref='-7878' />
+ <nd ref='-7876' />
+ <nd ref='-7874' />
+ <nd ref='-14934' />
+ <nd ref='-7872' />
+ <nd ref='-7870' />
+ <nd ref='-7868' />
+ <nd ref='-7866' />
+ <nd ref='-7864' />
+ <nd ref='-7862' />
+ <nd ref='-9846' />
+ <nd ref='-14932' />
+ <nd ref='-9848' />
+ <nd ref='-21404' />
+ <nd ref='-21402' />
+ <nd ref='-21400' />
+ <nd ref='-21408' />
+ <nd ref='-21410' />
+ <nd ref='-21406' />
+ <nd ref='-21398' />
+ <nd ref='-21396' />
+ <nd ref='-21394' />
+ <nd ref='-21414' />
+ <nd ref='-21412' />
+ <nd ref='-21424' />
+ <nd ref='-21422' />
+ <nd ref='-21420' />
+ <nd ref='-21416' />
+ <nd ref='-21418' />
+ <nd ref='-21330' />
+ <nd ref='-21328' />
+ <nd ref='-21326' />
+ <nd ref='-21324' />
+ <nd ref='-7860' />
+ <nd ref='-9850' />
+ <nd ref='-7858' />
+ <nd ref='-7856' />
+ <nd ref='-7854' />
+ <nd ref='-9852' />
+ <nd ref='-27798' />
+ <nd ref='-7852' />
+ <nd ref='-7850' />
+ <nd ref='-7848' />
+ <nd ref='-21318' />
+ <nd ref='-21316' />
+ <nd ref='-21320' />
+ <nd ref='-21322' />
+ <nd ref='-7846' />
+ <nd ref='-21508' />
+ <nd ref='-21506' />
+ <nd ref='-21504' />
+ <nd ref='-21502' />
+ <nd ref='-21500' />
+ <nd ref='-7844' />
+ <nd ref='-21510' />
+ <nd ref='-21512' />
+ <nd ref='-21514' />
+ <nd ref='-21516' />
+ <nd ref='-21518' />
+ <nd ref='-21526' />
+ <nd ref='-21524' />
+ <nd ref='-21528' />
+ <nd ref='-21520' />
+ <nd ref='-21522' />
+ <nd ref='-7842' />
+ <nd ref='-21538' />
+ <nd ref='-21540' />
+ <nd ref='-21532' />
+ <nd ref='-21534' />
+ <nd ref='-21536' />
+ <nd ref='-21530' />
+ <nd ref='-7840' />
+ <nd ref='-21466' />
+ <nd ref='-21470' />
+ <nd ref='-7838' />
+ <nd ref='-21498' />
+ <nd ref='-21490' />
+ <nd ref='-21492' />
+ <nd ref='-7836' />
+ <nd ref='-21482' />
+ <nd ref='-21484' />
+ <nd ref='-21486' />
+ <nd ref='-7834' />
+ <nd ref='-21476' />
+ <nd ref='-21474' />
+ <nd ref='-21480' />
+ <nd ref='-21478' />
+ <nd ref='-7832' />
+ <nd ref='-22148' />
+ <nd ref='-22150' />
+ <nd ref='-22152' />
+ <nd ref='-22160' />
+ <nd ref='-22164' />
+ <nd ref='-7830' />
+ <nd ref='-22168' />
+ <nd ref='-22166' />
+ <nd ref='-22172' />
+ <nd ref='-22178' />
+ <nd ref='-7828' />
+ <nd ref='-22194' />
+ <nd ref='-22196' />
+ <nd ref='-22192' />
+ <nd ref='-22190' />
+ <nd ref='-85088' />
+ <nd ref='-85090' />
+ <nd ref='-85098' />
+ <nd ref='-85100' />
+ <nd ref='-85102' />
+ <nd ref='-85104' />
+ <nd ref='-85106' />
+ <nd ref='-85108' />
+ <nd ref='-85110' />
+ <nd ref='-85112' />
+ <nd ref='-85114' />
+ <nd ref='-85116' />
+ <nd ref='-85118' />
+ <nd ref='-85120' />
+ <nd ref='-85122' />
+ <nd ref='-85124' />
+ <nd ref='-85126' />
+ <tag k='ISO3166-2' v='CN-65' />
+ <tag k='name:en' v='Xinjiang' />
+ </way>
+ <way id='-86238'>
+ <nd ref='-7972' />
+ <nd ref='-86237' />
+ <nd ref='-86239' />
+ <nd ref='-86241' />
+ <nd ref='-86243' />
+ <nd ref='-86245' />
+ <nd ref='-86247' />
+ <nd ref='-86249' />
+ <nd ref='-86251' />
+ <nd ref='-86253' />
+ <nd ref='-86255' />
+ <nd ref='-86257' />
+ <nd ref='-86259' />
+ <nd ref='-86261' />
+ <nd ref='-86263' />
+ <nd ref='-86265' />
+ <nd ref='-86267' />
+ <nd ref='-86269' />
+ <nd ref='-86271' />
+ <nd ref='-86273' />
+ <nd ref='-86275' />
+ <nd ref='-86277' />
+ <nd ref='-86279' />
+ <nd ref='-86281' />
+ <nd ref='-86283' />
+ <nd ref='-86285' />
+ <nd ref='-86287' />
+ <nd ref='-86289' />
+ <nd ref='-86291' />
+ <nd ref='-86293' />
+ <nd ref='-86295' />
+ <nd ref='-86297' />
+ <nd ref='-86299' />
+ <nd ref='-86301' />
+ <nd ref='-86303' />
+ <nd ref='-86305' />
+ <nd ref='-86307' />
+ <nd ref='-86309' />
+ <nd ref='-86311' />
+ <nd ref='-86313' />
+ <nd ref='-86315' />
+ <nd ref='-86317' />
+ <nd ref='-86319' />
+ <nd ref='-86321' />
+ <nd ref='-86323' />
+ <nd ref='-86325' />
+ <nd ref='-86327' />
+ <nd ref='-86329' />
+ <nd ref='-86331' />
+ <nd ref='-86333' />
+ <nd ref='-86335' />
+ <nd ref='-86337' />
+ <nd ref='-86339' />
+ <nd ref='-86341' />
+ <nd ref='-86343' />
+ <nd ref='-86345' />
+ <nd ref='-86347' />
+ <nd ref='-86349' />
+ <nd ref='-86351' />
+ <nd ref='-86353' />
+ <nd ref='-86355' />
+ <nd ref='-86357' />
+ <nd ref='-86359' />
+ <nd ref='-86361' />
+ <nd ref='-86363' />
+ <nd ref='-86365' />
+ <nd ref='-86367' />
+ <nd ref='-86369' />
+ <nd ref='-86371' />
+ <nd ref='-86373' />
+ <nd ref='-86375' />
+ <nd ref='-86377' />
+ <nd ref='-86379' />
+ <nd ref='-86381' />
+ <nd ref='-86383' />
+ <nd ref='-86385' />
+ <nd ref='-86387' />
+ <nd ref='-86389' />
+ <nd ref='-86391' />
+ <nd ref='-86393' />
+ <nd ref='-86395' />
+ <nd ref='-86397' />
+ <nd ref='-86399' />
+ <nd ref='-86401' />
+ <nd ref='-86403' />
+ <nd ref='-90648' />
+ <nd ref='-86405' />
+ <nd ref='-86407' />
+ <nd ref='-86409' />
+ <nd ref='-86411' />
+ <nd ref='-86413' />
+ <nd ref='-86415' />
+ <nd ref='-86417' />
+ <nd ref='-86419' />
+ <nd ref='-86421' />
+ <nd ref='-86423' />
+ <nd ref='-86425' />
+ <nd ref='-86427' />
+ <nd ref='-86429' />
+ <nd ref='-86431' />
+ <nd ref='-86433' />
+ <nd ref='-86435' />
+ <nd ref='-86437' />
+ <nd ref='-86439' />
+ <nd ref='-86441' />
+ <nd ref='-86443' />
+ <nd ref='-86445' />
+ <nd ref='-86447' />
+ <nd ref='-86449' />
+ <nd ref='-86451' />
+ <nd ref='-86453' />
+ <nd ref='-86455' />
+ <nd ref='-86457' />
+ <nd ref='-86459' />
+ <nd ref='-86461' />
+ <nd ref='-86463' />
+ <nd ref='-86465' />
+ <nd ref='-86467' />
+ <nd ref='-86469' />
+ <nd ref='-86471' />
+ <nd ref='-86473' />
+ <nd ref='-86475' />
+ <nd ref='-86477' />
+ <nd ref='-86479' />
+ <nd ref='-86481' />
+ <nd ref='-86483' />
+ <nd ref='-86485' />
+ <nd ref='-86487' />
+ <nd ref='-86489' />
+ <nd ref='-86491' />
+ <nd ref='-86493' />
+ <nd ref='-86495' />
+ <nd ref='-86497' />
+ <nd ref='-86499' />
+ <nd ref='-86501' />
+ <nd ref='-86503' />
+ <nd ref='-86505' />
+ <nd ref='-86507' />
+ <nd ref='-86509' />
+ <nd ref='-86511' />
+ <nd ref='-86513' />
+ <nd ref='-86515' />
+ <nd ref='-86517' />
+ <nd ref='-86519' />
+ <nd ref='-86521' />
+ <nd ref='-86523' />
+ <nd ref='-86525' />
+ <nd ref='-86527' />
+ <nd ref='-86529' />
+ <nd ref='-86531' />
+ <nd ref='-86533' />
+ <nd ref='-86535' />
+ <nd ref='-86537' />
+ <nd ref='-86539' />
+ <nd ref='-86541' />
+ <nd ref='-86547' />
+ <nd ref='-86555' />
+ <nd ref='-86559' />
+ <nd ref='-86561' />
+ <nd ref='-86563' />
+ <nd ref='-86567' />
+ <nd ref='-86569' />
+ <nd ref='-86573' />
+ <nd ref='-86577' />
+ <nd ref='-86581' />
+ <nd ref='-86603' />
+ <nd ref='-86605' />
+ <nd ref='-86607' />
+ <nd ref='-86609' />
+ <nd ref='-86611' />
+ <nd ref='-86613' />
+ <nd ref='-86615' />
+ <nd ref='-86617' />
+ <nd ref='-86619' />
+ <nd ref='-86621' />
+ <nd ref='-86627' />
+ <nd ref='-86629' />
+ <nd ref='-90119' />
+ <nd ref='-86635' />
+ <nd ref='-86641' />
+ <nd ref='-86647' />
+ <nd ref='-86653' />
+ <nd ref='-86655' />
+ <nd ref='-86663' />
+ <nd ref='-86665' />
+ <nd ref='-86667' />
+ <nd ref='-86669' />
+ <nd ref='-86671' />
+ <nd ref='-86673' />
+ <nd ref='-86675' />
+ <nd ref='-86677' />
+ <nd ref='-86679' />
+ <nd ref='-86681' />
+ <nd ref='-86683' />
+ <nd ref='-86685' />
+ <nd ref='-86687' />
+ <nd ref='-86689' />
+ <nd ref='-86691' />
+ <nd ref='-86693' />
+ <nd ref='-86695' />
+ <nd ref='-86697' />
+ <nd ref='-86699' />
+ <nd ref='-86701' />
+ <nd ref='-86703' />
+ <nd ref='-86705' />
+ <nd ref='-86707' />
+ <nd ref='-10458' />
+ <nd ref='-10456' />
+ <nd ref='-980' />
+ <nd ref='-978' />
+ <nd ref='-27856' />
+ <nd ref='-7906' />
+ <nd ref='-986' />
+ <nd ref='-982' />
+ <nd ref='-988' />
+ <nd ref='-984' />
+ <nd ref='-10454' />
+ <nd ref='-10452' />
+ <nd ref='-7908' />
+ <nd ref='-990' />
+ <nd ref='-7910' />
+ <nd ref='-10450' />
+ <nd ref='-998' />
+ <nd ref='-994' />
+ <nd ref='-992' />
+ <nd ref='-996' />
+ <nd ref='-7912' />
+ <nd ref='-1000' />
+ <nd ref='-1006' />
+ <nd ref='-1004' />
+ <nd ref='-1002' />
+ <nd ref='-10448' />
+ <nd ref='-1014' />
+ <nd ref='-1008' />
+ <nd ref='-1012' />
+ <nd ref='-1010' />
+ <nd ref='-10446' />
+ <nd ref='-10444' />
+ <nd ref='-1016' />
+ <nd ref='-7914' />
+ <nd ref='-7916' />
+ <nd ref='-10442' />
+ <nd ref='-1020' />
+ <nd ref='-1018' />
+ <nd ref='-10440' />
+ <nd ref='-1026' />
+ <nd ref='-1024' />
+ <nd ref='-1022' />
+ <nd ref='-7918' />
+ <nd ref='-7920' />
+ <nd ref='-7922' />
+ <nd ref='-1028' />
+ <nd ref='-7924' />
+ <nd ref='-10438' />
+ <nd ref='-7926' />
+ <nd ref='-7928' />
+ <nd ref='-7930' />
+ <nd ref='-1030' />
+ <nd ref='-10436' />
+ <nd ref='-1032' />
+ <nd ref='-7932' />
+ <nd ref='-1034' />
+ <nd ref='-7934' />
+ <nd ref='-10434' />
+ <nd ref='-1058' />
+ <nd ref='-1056' />
+ <nd ref='-1054' />
+ <nd ref='-1052' />
+ <nd ref='-1048' />
+ <nd ref='-1042' />
+ <nd ref='-1044' />
+ <nd ref='-1046' />
+ <nd ref='-1050' />
+ <nd ref='-1040' />
+ <nd ref='-1038' />
+ <nd ref='-1036' />
+ <nd ref='-7936' />
+ <nd ref='-1080' />
+ <nd ref='-1078' />
+ <nd ref='-1074' />
+ <nd ref='-1076' />
+ <nd ref='-1072' />
+ <nd ref='-1060' />
+ <nd ref='-1062' />
+ <nd ref='-1064' />
+ <nd ref='-1066' />
+ <nd ref='-1068' />
+ <nd ref='-1070' />
+ <nd ref='-7938' />
+ <nd ref='-10432' />
+ <nd ref='-7940' />
+ <nd ref='-10430' />
+ <nd ref='-7942' />
+ <nd ref='-10428' />
+ <nd ref='-1086' />
+ <nd ref='-1082' />
+ <nd ref='-1084' />
+ <nd ref='-1088' />
+ <nd ref='-10426' />
+ <nd ref='-1090' />
+ <nd ref='-7944' />
+ <nd ref='-10424' />
+ <nd ref='-10422' />
+ <nd ref='-1092' />
+ <nd ref='-10420' />
+ <nd ref='-7946' />
+ <nd ref='-10418' />
+ <nd ref='-7948' />
+ <nd ref='-10416' />
+ <nd ref='-7950' />
+ <nd ref='-10414' />
+ <nd ref='-10412' />
+ <nd ref='-7952' />
+ <nd ref='-7954' />
+ <nd ref='-10410' />
+ <nd ref='-7956' />
+ <nd ref='-7958' />
+ <nd ref='-7960' />
+ <nd ref='-13034' />
+ <nd ref='-13036' />
+ <nd ref='-7962' />
+ <nd ref='-13032' />
+ <nd ref='-13030' />
+ <nd ref='-7964' />
+ <nd ref='-13028' />
+ <nd ref='-7966' />
+ <nd ref='-13026' />
+ <nd ref='-7968' />
+ <nd ref='-7970' />
+ <nd ref='-13024' />
+ <nd ref='-13022' />
+ <nd ref='-13020' />
+ <nd ref='-13018' />
+ <nd ref='-7972' />
+ <tag k='ISO3166-2' v='CN-15' />
+ <tag k='name:en' v='Inner Mongolia' />
+ </way>
+ <way id='-86868'>
+ <nd ref='-85288' />
+ <nd ref='-86867' />
+ <nd ref='-86873' />
+ <nd ref='-86875' />
+ <nd ref='-86877' />
+ <nd ref='-86879' />
+ <nd ref='-86881' />
+ <nd ref='-86883' />
+ <nd ref='-86885' />
+ <nd ref='-86887' />
+ <nd ref='-86889' />
+ <nd ref='-86891' />
+ <nd ref='-86893' />
+ <nd ref='-86895' />
+ <nd ref='-86897' />
+ <nd ref='-86899' />
+ <nd ref='-86903' />
+ <nd ref='-86905' />
+ <nd ref='-86907' />
+ <nd ref='-86909' />
+ <nd ref='-86913' />
+ <nd ref='-86915' />
+ <nd ref='-86917' />
+ <nd ref='-86919' />
+ <nd ref='-86921' />
+ <nd ref='-86923' />
+ <nd ref='-86925' />
+ <nd ref='-86929' />
+ <nd ref='-86931' />
+ <nd ref='-86933' />
+ <nd ref='-86935' />
+ <nd ref='-86937' />
+ <nd ref='-86939' />
+ <nd ref='-86941' />
+ <nd ref='-86943' />
+ <nd ref='-86947' />
+ <nd ref='-86949' />
+ <nd ref='-86951' />
+ <nd ref='-86953' />
+ <nd ref='-86959' />
+ <nd ref='-86961' />
+ <nd ref='-86965' />
+ <nd ref='-86969' />
+ <nd ref='-86973' />
+ <nd ref='-86977' />
+ <nd ref='-86979' />
+ <nd ref='-86981' />
+ <nd ref='-86985' />
+ <nd ref='-86987' />
+ <nd ref='-86991' />
+ <nd ref='-86993' />
+ <nd ref='-86995' />
+ <nd ref='-86997' />
+ <nd ref='-87001' />
+ <nd ref='-87007' />
+ <nd ref='-87011' />
+ <nd ref='-87013' />
+ <nd ref='-87015' />
+ <nd ref='-87017' />
+ <nd ref='-87019' />
+ <nd ref='-87021' />
+ <nd ref='-87023' />
+ <nd ref='-87025' />
+ <nd ref='-87033' />
+ <nd ref='-87037' />
+ <nd ref='-87043' />
+ <nd ref='-87051' />
+ <nd ref='-87055' />
+ <nd ref='-87059' />
+ <nd ref='-87069' />
+ <nd ref='-87071' />
+ <nd ref='-87077' />
+ <nd ref='-87079' />
+ <nd ref='-87081' />
+ <nd ref='-87083' />
+ <nd ref='-87085' />
+ <nd ref='-87087' />
+ <nd ref='-87171' />
+ <nd ref='-87175' />
+ <nd ref='-87179' />
+ <nd ref='-87185' />
+ <nd ref='-87187' />
+ <nd ref='-87189' />
+ <nd ref='-87191' />
+ <nd ref='-87193' />
+ <nd ref='-87195' />
+ <nd ref='-87197' />
+ <nd ref='-87199' />
+ <nd ref='-87201' />
+ <nd ref='-85656' />
+ <nd ref='-85654' />
+ <nd ref='-85652' />
+ <nd ref='-85650' />
+ <nd ref='-85648' />
+ <nd ref='-85646' />
+ <nd ref='-85644' />
+ <nd ref='-85642' />
+ <nd ref='-85640' />
+ <nd ref='-85638' />
+ <nd ref='-85636' />
+ <nd ref='-85634' />
+ <nd ref='-85632' />
+ <nd ref='-85630' />
+ <nd ref='-85628' />
+ <nd ref='-85626' />
+ <nd ref='-85624' />
+ <nd ref='-85126' />
+ <nd ref='-85130' />
+ <nd ref='-85132' />
+ <nd ref='-85136' />
+ <nd ref='-85146' />
+ <nd ref='-85150' />
+ <nd ref='-85154' />
+ <nd ref='-85156' />
+ <nd ref='-85160' />
+ <nd ref='-85166' />
+ <nd ref='-85168' />
+ <nd ref='-85172' />
+ <nd ref='-85174' />
+ <nd ref='-85182' />
+ <nd ref='-85184' />
+ <nd ref='-85186' />
+ <nd ref='-85188' />
+ <nd ref='-85196' />
+ <nd ref='-85200' />
+ <nd ref='-85204' />
+ <nd ref='-85206' />
+ <nd ref='-85208' />
+ <nd ref='-85214' />
+ <nd ref='-85216' />
+ <nd ref='-85218' />
+ <nd ref='-85220' />
+ <nd ref='-85222' />
+ <nd ref='-85224' />
+ <nd ref='-85242' />
+ <nd ref='-85244' />
+ <nd ref='-85246' />
+ <nd ref='-85248' />
+ <nd ref='-85250' />
+ <nd ref='-85252' />
+ <nd ref='-85254' />
+ <nd ref='-85256' />
+ <nd ref='-85258' />
+ <nd ref='-85260' />
+ <nd ref='-85262' />
+ <nd ref='-85264' />
+ <nd ref='-85266' />
+ <nd ref='-85268' />
+ <nd ref='-85270' />
+ <nd ref='-85272' />
+ <nd ref='-85274' />
+ <nd ref='-85276' />
+ <nd ref='-85278' />
+ <nd ref='-85284' />
+ <nd ref='-85286' />
+ <nd ref='-85288' />
+ <tag k='ISO3166-2' v='CN-63' />
+ <tag k='name:en' v='Qinghai' />
+ </way>
+ <way id='-87708'>
+ <nd ref='-2504' />
+ <nd ref='-87344' />
+ <nd ref='-87346' />
+ <nd ref='-87348' />
+ <nd ref='-87350' />
+ <nd ref='-87352' />
+ <nd ref='-87354' />
+ <nd ref='-87356' />
+ <nd ref='-87358' />
+ <nd ref='-87360' />
+ <nd ref='-87362' />
+ <nd ref='-87364' />
+ <nd ref='-87366' />
+ <nd ref='-87368' />
+ <nd ref='-87370' />
+ <nd ref='-87372' />
+ <nd ref='-87374' />
+ <nd ref='-87376' />
+ <nd ref='-87378' />
+ <nd ref='-87380' />
+ <nd ref='-87382' />
+ <nd ref='-87384' />
+ <nd ref='-87386' />
+ <nd ref='-87388' />
+ <nd ref='-87390' />
+ <nd ref='-87392' />
+ <nd ref='-87394' />
+ <nd ref='-87396' />
+ <nd ref='-87398' />
+ <nd ref='-87400' />
+ <nd ref='-87402' />
+ <nd ref='-87404' />
+ <nd ref='-87406' />
+ <nd ref='-87408' />
+ <nd ref='-87410' />
+ <nd ref='-87412' />
+ <nd ref='-87414' />
+ <nd ref='-87416' />
+ <nd ref='-87418' />
+ <nd ref='-87420' />
+ <nd ref='-87422' />
+ <nd ref='-87424' />
+ <nd ref='-87426' />
+ <nd ref='-87428' />
+ <nd ref='-87430' />
+ <nd ref='-87432' />
+ <nd ref='-87434' />
+ <nd ref='-87436' />
+ <nd ref='-87438' />
+ <nd ref='-87440' />
+ <nd ref='-87442' />
+ <nd ref='-87444' />
+ <nd ref='-87446' />
+ <nd ref='-87448' />
+ <nd ref='-87450' />
+ <nd ref='-87452' />
+ <nd ref='-87454' />
+ <nd ref='-87456' />
+ <nd ref='-87458' />
+ <nd ref='-87460' />
+ <nd ref='-87462' />
+ <nd ref='-87464' />
+ <nd ref='-87466' />
+ <nd ref='-87468' />
+ <nd ref='-87470' />
+ <nd ref='-87472' />
+ <nd ref='-87474' />
+ <nd ref='-87476' />
+ <nd ref='-87478' />
+ <nd ref='-87480' />
+ <nd ref='-87482' />
+ <nd ref='-87484' />
+ <nd ref='-87486' />
+ <nd ref='-87488' />
+ <nd ref='-87490' />
+ <nd ref='-87492' />
+ <nd ref='-87494' />
+ <nd ref='-87496' />
+ <nd ref='-87498' />
+ <nd ref='-87500' />
+ <nd ref='-87502' />
+ <nd ref='-87504' />
+ <nd ref='-87506' />
+ <nd ref='-87508' />
+ <nd ref='-87510' />
+ <nd ref='-87512' />
+ <nd ref='-87514' />
+ <nd ref='-87516' />
+ <nd ref='-87518' />
+ <nd ref='-87520' />
+ <nd ref='-87707' />
+ <nd ref='-87709' />
+ <nd ref='-87711' />
+ <nd ref='-87713' />
+ <nd ref='-87715' />
+ <nd ref='-87717' />
+ <nd ref='-87719' />
+ <nd ref='-87721' />
+ <nd ref='-87727' />
+ <nd ref='-87731' />
+ <nd ref='-87733' />
+ <nd ref='-87845' />
+ <nd ref='-87847' />
+ <nd ref='-87849' />
+ <nd ref='-87851' />
+ <nd ref='-87853' />
+ <nd ref='-87855' />
+ <nd ref='-87857' />
+ <nd ref='-87859' />
+ <nd ref='-87861' />
+ <nd ref='-87863' />
+ <nd ref='-87865' />
+ <nd ref='-87867' />
+ <nd ref='-87869' />
+ <nd ref='-87871' />
+ <nd ref='-87873' />
+ <nd ref='-87875' />
+ <nd ref='-87877' />
+ <nd ref='-87883' />
+ <nd ref='-87885' />
+ <nd ref='-87887' />
+ <nd ref='-87889' />
+ <nd ref='-87891' />
+ <nd ref='-87893' />
+ <nd ref='-87895' />
+ <nd ref='-11966' />
+ <nd ref='-11964' />
+ <nd ref='-7766' />
+ <nd ref='-2386' />
+ <nd ref='-27248' />
+ <nd ref='-27246' />
+ <nd ref='-27244' />
+ <nd ref='-27242' />
+ <nd ref='-2384' />
+ <nd ref='-2388' />
+ <nd ref='-2390' />
+ <nd ref='-2392' />
+ <nd ref='-2394' />
+ <nd ref='-2396' />
+ <nd ref='-2398' />
+ <nd ref='-2400' />
+ <nd ref='-2402' />
+ <nd ref='-2404' />
+ <nd ref='-2406' />
+ <nd ref='-2408' />
+ <nd ref='-2410' />
+ <nd ref='-2412' />
+ <nd ref='-2414' />
+ <nd ref='-2416' />
+ <nd ref='-2418' />
+ <nd ref='-2420' />
+ <nd ref='-2422' />
+ <nd ref='-2424' />
+ <nd ref='-2426' />
+ <nd ref='-2428' />
+ <nd ref='-2430' />
+ <nd ref='-2432' />
+ <nd ref='-2434' />
+ <nd ref='-2436' />
+ <nd ref='-2440' />
+ <nd ref='-2438' />
+ <nd ref='-2442' />
+ <nd ref='-27240' />
+ <nd ref='-2444' />
+ <nd ref='-2454' />
+ <nd ref='-2450' />
+ <nd ref='-2446' />
+ <nd ref='-2448' />
+ <nd ref='-2452' />
+ <nd ref='-2456' />
+ <nd ref='-2554' />
+ <nd ref='-2458' />
+ <nd ref='-2462' />
+ <nd ref='-2460' />
+ <nd ref='-2468' />
+ <nd ref='-2466' />
+ <nd ref='-2470' />
+ <nd ref='-2464' />
+ <nd ref='-27238' />
+ <nd ref='-27236' />
+ <nd ref='-2484' />
+ <nd ref='-27234' />
+ <nd ref='-27232' />
+ <nd ref='-2472' />
+ <nd ref='-2474' />
+ <nd ref='-2476' />
+ <nd ref='-2482' />
+ <nd ref='-2480' />
+ <nd ref='-2478' />
+ <nd ref='-2486' />
+ <nd ref='-2488' />
+ <nd ref='-2490' />
+ <nd ref='-2492' />
+ <nd ref='-2494' />
+ <nd ref='-2496' />
+ <nd ref='-2498' />
+ <nd ref='-27230' />
+ <nd ref='-2500' />
+ <nd ref='-2502' />
+ <nd ref='-2550' />
+ <nd ref='-2504' />
+ <tag k='ISO3166-2' v='CN-45' />
+ <tag k='name:en' v='Guangxi' />
+ </way>
+ <way id='-88317'>
+ <nd ref='-87376' />
+ <nd ref='-88316' />
+ <nd ref='-88318' />
+ <nd ref='-88320' />
+ <nd ref='-88322' />
+ <nd ref='-88324' />
+ <nd ref='-88326' />
+ <nd ref='-88328' />
+ <nd ref='-88330' />
+ <nd ref='-88332' />
+ <nd ref='-88334' />
+ <nd ref='-88336' />
+ <nd ref='-88338' />
+ <nd ref='-88340' />
+ <nd ref='-88342' />
+ <nd ref='-88344' />
+ <nd ref='-88346' />
+ <nd ref='-88348' />
+ <nd ref='-88350' />
+ <nd ref='-88352' />
+ <nd ref='-88354' />
+ <nd ref='-88356' />
+ <nd ref='-88358' />
+ <nd ref='-88360' />
+ <nd ref='-88362' />
+ <nd ref='-88364' />
+ <nd ref='-88366' />
+ <nd ref='-88368' />
+ <nd ref='-88370' />
+ <nd ref='-88372' />
+ <nd ref='-88374' />
+ <nd ref='-88376' />
+ <nd ref='-88378' />
+ <nd ref='-88380' />
+ <nd ref='-88382' />
+ <nd ref='-88384' />
+ <nd ref='-88386' />
+ <nd ref='-88388' />
+ <nd ref='-88390' />
+ <nd ref='-88392' />
+ <nd ref='-88394' />
+ <nd ref='-88396' />
+ <nd ref='-88398' />
+ <nd ref='-88402' />
+ <nd ref='-88406' />
+ <nd ref='-88408' />
+ <nd ref='-88410' />
+ <nd ref='-88412' />
+ <nd ref='-88414' />
+ <nd ref='-88416' />
+ <nd ref='-88418' />
+ <nd ref='-88422' />
+ <nd ref='-88424' />
+ <nd ref='-88426' />
+ <nd ref='-88428' />
+ <nd ref='-88430' />
+ <nd ref='-88432' />
+ <nd ref='-88434' />
+ <nd ref='-88438' />
+ <nd ref='-88442' />
+ <nd ref='-88444' />
+ <nd ref='-88446' />
+ <nd ref='-88448' />
+ <nd ref='-88450' />
+ <nd ref='-88454' />
+ <nd ref='-88456' />
+ <nd ref='-88458' />
+ <nd ref='-88460' />
+ <nd ref='-88462' />
+ <nd ref='-88464' />
+ <nd ref='-88468' />
+ <nd ref='-88470' />
+ <nd ref='-88472' />
+ <nd ref='-88474' />
+ <nd ref='-88476' />
+ <nd ref='-88478' />
+ <nd ref='-88480' />
+ <nd ref='-88482' />
+ <nd ref='-88484' />
+ <nd ref='-88486' />
+ <nd ref='-88488' />
+ <nd ref='-88490' />
+ <nd ref='-85370' />
+ <nd ref='-85372' />
+ <nd ref='-85374' />
+ <nd ref='-85376' />
+ <nd ref='-85378' />
+ <nd ref='-85380' />
+ <nd ref='-85382' />
+ <nd ref='-85384' />
+ <nd ref='-85386' />
+ <nd ref='-85388' />
+ <nd ref='-85390' />
+ <nd ref='-85392' />
+ <nd ref='-85394' />
+ <nd ref='-85396' />
+ <nd ref='-85398' />
+ <nd ref='-85400' />
+ <nd ref='-85402' />
+ <nd ref='-85404' />
+ <nd ref='-85406' />
+ <nd ref='-85408' />
+ <nd ref='-85410' />
+ <nd ref='-85412' />
+ <nd ref='-85414' />
+ <nd ref='-85416' />
+ <nd ref='-85418' />
+ <nd ref='-21942' />
+ <nd ref='-21918' />
+ <nd ref='-21920' />
+ <nd ref='-21922' />
+ <nd ref='-21924' />
+ <nd ref='-21926' />
+ <nd ref='-7798' />
+ <nd ref='-21916' />
+ <nd ref='-21914' />
+ <nd ref='-21912' />
+ <nd ref='-21910' />
+ <nd ref='-7796' />
+ <nd ref='-21908' />
+ <nd ref='-21906' />
+ <nd ref='-27408' />
+ <nd ref='-21904' />
+ <nd ref='-21902' />
+ <nd ref='-21900' />
+ <nd ref='-21896' />
+ <nd ref='-21894' />
+ <nd ref='-21898' />
+ <nd ref='-21892' />
+ <nd ref='-21890' />
+ <nd ref='-21888' />
+ <nd ref='-21886' />
+ <nd ref='-21884' />
+ <nd ref='-21880' />
+ <nd ref='-21882' />
+ <nd ref='-21878' />
+ <nd ref='-21876' />
+ <nd ref='-21874' />
+ <nd ref='-21872' />
+ <nd ref='-27406' />
+ <nd ref='-21870' />
+ <nd ref='-27404' />
+ <nd ref='-7794' />
+ <nd ref='-27400' />
+ <nd ref='-27402' />
+ <nd ref='-27398' />
+ <nd ref='-27396' />
+ <nd ref='-21868' />
+ <nd ref='-21852' />
+ <nd ref='-27394' />
+ <nd ref='-21854' />
+ <nd ref='-21864' />
+ <nd ref='-21866' />
+ <nd ref='-21856' />
+ <nd ref='-21862' />
+ <nd ref='-21858' />
+ <nd ref='-27392' />
+ <nd ref='-21860' />
+ <nd ref='-7792' />
+ <nd ref='-27390' />
+ <nd ref='-27388' />
+ <nd ref='-7790' />
+ <nd ref='-7788' />
+ <nd ref='-27386' />
+ <nd ref='-27384' />
+ <nd ref='-21850' />
+ <nd ref='-27382' />
+ <nd ref='-27380' />
+ <nd ref='-27376' />
+ <nd ref='-27378' />
+ <nd ref='-27374' />
+ <nd ref='-27372' />
+ <nd ref='-27370' />
+ <nd ref='-27368' />
+ <nd ref='-27366' />
+ <nd ref='-27364' />
+ <nd ref='-27362' />
+ <nd ref='-27348' />
+ <nd ref='-27350' />
+ <nd ref='-27360' />
+ <nd ref='-27358' />
+ <nd ref='-27356' />
+ <nd ref='-27354' />
+ <nd ref='-27352' />
+ <nd ref='-27346' />
+ <nd ref='-7786' />
+ <nd ref='-21846' />
+ <nd ref='-21848' />
+ <nd ref='-27344' />
+ <nd ref='-7784' />
+ <nd ref='-21844' />
+ <nd ref='-21842' />
+ <nd ref='-21824' />
+ <nd ref='-21826' />
+ <nd ref='-27342' />
+ <nd ref='-27340' />
+ <nd ref='-21832' />
+ <nd ref='-21828' />
+ <nd ref='-21834' />
+ <nd ref='-21830' />
+ <nd ref='-21838' />
+ <nd ref='-21836' />
+ <nd ref='-21840' />
+ <nd ref='-27338' />
+ <nd ref='-7782' />
+ <nd ref='-21816' />
+ <nd ref='-21820' />
+ <nd ref='-21822' />
+ <nd ref='-21818' />
+ <nd ref='-7780' />
+ <nd ref='-7778' />
+ <nd ref='-7776' />
+ <nd ref='-7774' />
+ <nd ref='-21808' />
+ <nd ref='-21814' />
+ <nd ref='-21810' />
+ <nd ref='-21812' />
+ <nd ref='-27336' />
+ <nd ref='-27334' />
+ <nd ref='-7772' />
+ <nd ref='-21802' />
+ <nd ref='-21804' />
+ <nd ref='-21806' />
+ <nd ref='-21770' />
+ <nd ref='-21776' />
+ <nd ref='-21774' />
+ <nd ref='-21772' />
+ <nd ref='-27332' />
+ <nd ref='-21778' />
+ <nd ref='-21780' />
+ <nd ref='-21782' />
+ <nd ref='-21784' />
+ <nd ref='-21798' />
+ <nd ref='-21800' />
+ <nd ref='-21796' />
+ <nd ref='-21794' />
+ <nd ref='-21790' />
+ <nd ref='-21792' />
+ <nd ref='-21786' />
+ <nd ref='-21788' />
+ <nd ref='-7770' />
+ <nd ref='-7768' />
+ <nd ref='-10324' />
+ <nd ref='-18622' />
+ <nd ref='-18624' />
+ <nd ref='-18628' />
+ <nd ref='-18630' />
+ <nd ref='-9946' />
+ <nd ref='-9948' />
+ <nd ref='-18636' />
+ <nd ref='-18638' />
+ <nd ref='-18640' />
+ <nd ref='-18642' />
+ <nd ref='-18644' />
+ <nd ref='-18646' />
+ <nd ref='-18650' />
+ <nd ref='-18652' />
+ <nd ref='-18654' />
+ <nd ref='-18648' />
+ <nd ref='-18656' />
+ <nd ref='-18658' />
+ <nd ref='-18662' />
+ <nd ref='-18664' />
+ <nd ref='-18666' />
+ <nd ref='-18660' />
+ <nd ref='-18634' />
+ <nd ref='-18632' />
+ <nd ref='-18670' />
+ <nd ref='-18678' />
+ <nd ref='-18680' />
+ <nd ref='-18668' />
+ <nd ref='-18692' />
+ <nd ref='-18674' />
+ <nd ref='-18676' />
+ <nd ref='-18672' />
+ <nd ref='-18682' />
+ <nd ref='-18690' />
+ <nd ref='-18688' />
+ <nd ref='-18686' />
+ <nd ref='-18684' />
+ <nd ref='-9938' />
+ <nd ref='-9940' />
+ <nd ref='-2556' />
+ <nd ref='-2572' />
+ <nd ref='-2570' />
+ <nd ref='-2568' />
+ <nd ref='-2566' />
+ <nd ref='-2562' />
+ <nd ref='-2564' />
+ <nd ref='-2558' />
+ <nd ref='-2560' />
+ <nd ref='-2578' />
+ <nd ref='-2576' />
+ <nd ref='-2574' />
+ <nd ref='-2602' />
+ <nd ref='-2580' />
+ <nd ref='-2588' />
+ <nd ref='-2586' />
+ <nd ref='-2584' />
+ <nd ref='-2582' />
+ <nd ref='-2600' />
+ <nd ref='-2596' />
+ <nd ref='-2594' />
+ <nd ref='-2598' />
+ <nd ref='-2592' />
+ <nd ref='-2590' />
+ <nd ref='-2604' />
+ <nd ref='-27216' />
+ <nd ref='-27214' />
+ <nd ref='-27220' />
+ <nd ref='-27218' />
+ <nd ref='-2606' />
+ <nd ref='-27222' />
+ <nd ref='-27224' />
+ <nd ref='-27226' />
+ <nd ref='-2610' />
+ <nd ref='-2608' />
+ <nd ref='-2612' />
+ <nd ref='-2614' />
+ <nd ref='-2616' />
+ <nd ref='-2618' />
+ <nd ref='-2546' />
+ <nd ref='-2552' />
+ <nd ref='-2544' />
+ <nd ref='-2542' />
+ <nd ref='-2548' />
+ <nd ref='-2538' />
+ <nd ref='-27228' />
+ <nd ref='-2540' />
+ <nd ref='-2534' />
+ <nd ref='-2536' />
+ <nd ref='-2532' />
+ <nd ref='-2530' />
+ <nd ref='-2528' />
+ <nd ref='-2526' />
+ <nd ref='-2524' />
+ <nd ref='-2516' />
+ <nd ref='-2518' />
+ <nd ref='-2514' />
+ <nd ref='-2512' />
+ <nd ref='-2520' />
+ <nd ref='-2522' />
+ <nd ref='-2510' />
+ <nd ref='-2508' />
+ <nd ref='-2506' />
+ <nd ref='-2504' />
+ <nd ref='-87344' />
+ <nd ref='-87346' />
+ <nd ref='-87348' />
+ <nd ref='-87350' />
+ <nd ref='-87352' />
+ <nd ref='-87354' />
+ <nd ref='-87356' />
+ <nd ref='-87358' />
+ <nd ref='-87360' />
+ <nd ref='-87362' />
+ <nd ref='-87364' />
+ <nd ref='-87366' />
+ <nd ref='-87368' />
+ <nd ref='-87370' />
+ <nd ref='-87372' />
+ <nd ref='-87374' />
+ <nd ref='-87376' />
+ <tag k='ISO3166-2' v='CN-53' />
+ <tag k='name:en' v='Yunnan' />
+ </way>
+ <way id='-89333'>
+ <nd ref='-86949' />
+ <nd ref='-89332' />
+ <nd ref='-89334' />
+ <nd ref='-89336' />
+ <nd ref='-89338' />
+ <nd ref='-89340' />
+ <nd ref='-89342' />
+ <nd ref='-89344' />
+ <nd ref='-89346' />
+ <nd ref='-89348' />
+ <nd ref='-89350' />
+ <nd ref='-89352' />
+ <nd ref='-89354' />
+ <nd ref='-89356' />
+ <nd ref='-89358' />
+ <nd ref='-89360' />
+ <nd ref='-89362' />
+ <nd ref='-89364' />
+ <nd ref='-89366' />
+ <nd ref='-89368' />
+ <nd ref='-89370' />
+ <nd ref='-90195' />
+ <nd ref='-89372' />
+ <nd ref='-89374' />
+ <nd ref='-89376' />
+ <nd ref='-89378' />
+ <nd ref='-89380' />
+ <nd ref='-89382' />
+ <nd ref='-89384' />
+ <nd ref='-89386' />
+ <nd ref='-89388' />
+ <nd ref='-89390' />
+ <nd ref='-89392' />
+ <nd ref='-89394' />
+ <nd ref='-89396' />
+ <nd ref='-89398' />
+ <nd ref='-89400' />
+ <nd ref='-89402' />
+ <nd ref='-89404' />
+ <nd ref='-89406' />
+ <nd ref='-89408' />
+ <nd ref='-89410' />
+ <nd ref='-89412' />
+ <nd ref='-89414' />
+ <nd ref='-89416' />
+ <nd ref='-89418' />
+ <nd ref='-89420' />
+ <nd ref='-89422' />
+ <nd ref='-89424' />
+ <nd ref='-89426' />
+ <nd ref='-89428' />
+ <nd ref='-89430' />
+ <nd ref='-89432' />
+ <nd ref='-89434' />
+ <nd ref='-89436' />
+ <nd ref='-89438' />
+ <nd ref='-89440' />
+ <nd ref='-89442' />
+ <nd ref='-89444' />
+ <nd ref='-89446' />
+ <nd ref='-89448' />
+ <nd ref='-89450' />
+ <nd ref='-89452' />
+ <nd ref='-89454' />
+ <nd ref='-89456' />
+ <nd ref='-89458' />
+ <nd ref='-89460' />
+ <nd ref='-89462' />
+ <nd ref='-89464' />
+ <nd ref='-89466' />
+ <nd ref='-89468' />
+ <nd ref='-89470' />
+ <nd ref='-89472' />
+ <nd ref='-89474' />
+ <nd ref='-89476' />
+ <nd ref='-89478' />
+ <nd ref='-89480' />
+ <nd ref='-89482' />
+ <nd ref='-89484' />
+ <nd ref='-89486' />
+ <nd ref='-89488' />
+ <nd ref='-89490' />
+ <nd ref='-89492' />
+ <nd ref='-89494' />
+ <nd ref='-88384' />
+ <nd ref='-88388' />
+ <nd ref='-88390' />
+ <nd ref='-88392' />
+ <nd ref='-88394' />
+ <nd ref='-88396' />
+ <nd ref='-88398' />
+ <nd ref='-88402' />
+ <nd ref='-88406' />
+ <nd ref='-88408' />
+ <nd ref='-88410' />
+ <nd ref='-88412' />
+ <nd ref='-88414' />
+ <nd ref='-88416' />
+ <nd ref='-88418' />
+ <nd ref='-88422' />
+ <nd ref='-88424' />
+ <nd ref='-88426' />
+ <nd ref='-88428' />
+ <nd ref='-88430' />
+ <nd ref='-88432' />
+ <nd ref='-88434' />
+ <nd ref='-88438' />
+ <nd ref='-88442' />
+ <nd ref='-88444' />
+ <nd ref='-88446' />
+ <nd ref='-88448' />
+ <nd ref='-88450' />
+ <nd ref='-88454' />
+ <nd ref='-88456' />
+ <nd ref='-88458' />
+ <nd ref='-88460' />
+ <nd ref='-88462' />
+ <nd ref='-88464' />
+ <nd ref='-88468' />
+ <nd ref='-88470' />
+ <nd ref='-88472' />
+ <nd ref='-88474' />
+ <nd ref='-88476' />
+ <nd ref='-88478' />
+ <nd ref='-88480' />
+ <nd ref='-88482' />
+ <nd ref='-88484' />
+ <nd ref='-88486' />
+ <nd ref='-88488' />
+ <nd ref='-88490' />
+ <nd ref='-85370' />
+ <nd ref='-85368' />
+ <nd ref='-85364' />
+ <nd ref='-85358' />
+ <nd ref='-85356' />
+ <nd ref='-85354' />
+ <nd ref='-85352' />
+ <nd ref='-85350' />
+ <nd ref='-85344' />
+ <nd ref='-85342' />
+ <nd ref='-85336' />
+ <nd ref='-85334' />
+ <nd ref='-85330' />
+ <nd ref='-85328' />
+ <nd ref='-85326' />
+ <nd ref='-85322' />
+ <nd ref='-85320' />
+ <nd ref='-85318' />
+ <nd ref='-85314' />
+ <nd ref='-85310' />
+ <nd ref='-85308' />
+ <nd ref='-85304' />
+ <nd ref='-85302' />
+ <nd ref='-85298' />
+ <nd ref='-85294' />
+ <nd ref='-85292' />
+ <nd ref='-85290' />
+ <nd ref='-85288' />
+ <nd ref='-86867' />
+ <nd ref='-86873' />
+ <nd ref='-86875' />
+ <nd ref='-86877' />
+ <nd ref='-86879' />
+ <nd ref='-86881' />
+ <nd ref='-86883' />
+ <nd ref='-86885' />
+ <nd ref='-86887' />
+ <nd ref='-86889' />
+ <nd ref='-86891' />
+ <nd ref='-86893' />
+ <nd ref='-86895' />
+ <nd ref='-86897' />
+ <nd ref='-86899' />
+ <nd ref='-86903' />
+ <nd ref='-86905' />
+ <nd ref='-86907' />
+ <nd ref='-86909' />
+ <nd ref='-86913' />
+ <nd ref='-86915' />
+ <nd ref='-86917' />
+ <nd ref='-86919' />
+ <nd ref='-86921' />
+ <nd ref='-86923' />
+ <nd ref='-86925' />
+ <nd ref='-86929' />
+ <nd ref='-86931' />
+ <nd ref='-86933' />
+ <nd ref='-86935' />
+ <nd ref='-86937' />
+ <nd ref='-86939' />
+ <nd ref='-86941' />
+ <nd ref='-86943' />
+ <nd ref='-86947' />
+ <nd ref='-86949' />
+ <tag k='ISO3166-2' v='CN-51' />
+ <tag k='name:en' v='Sichuan' />
+ </way>
+ <way id='-90005'>
+ <nd ref='-89338' />
+ <nd ref='-89336' />
+ <nd ref='-89334' />
+ <nd ref='-89332' />
+ <nd ref='-86949' />
+ <nd ref='-86951' />
+ <nd ref='-86953' />
+ <nd ref='-86959' />
+ <nd ref='-86961' />
+ <nd ref='-86965' />
+ <nd ref='-86969' />
+ <nd ref='-86973' />
+ <nd ref='-86977' />
+ <nd ref='-86979' />
+ <nd ref='-86981' />
+ <nd ref='-86985' />
+ <nd ref='-86987' />
+ <nd ref='-86991' />
+ <nd ref='-86993' />
+ <nd ref='-86995' />
+ <nd ref='-86997' />
+ <nd ref='-87001' />
+ <nd ref='-87007' />
+ <nd ref='-87011' />
+ <nd ref='-87013' />
+ <nd ref='-87015' />
+ <nd ref='-87017' />
+ <nd ref='-87019' />
+ <nd ref='-87021' />
+ <nd ref='-87023' />
+ <nd ref='-87025' />
+ <nd ref='-87033' />
+ <nd ref='-87037' />
+ <nd ref='-87043' />
+ <nd ref='-87051' />
+ <nd ref='-87055' />
+ <nd ref='-87059' />
+ <nd ref='-87069' />
+ <nd ref='-87071' />
+ <nd ref='-87077' />
+ <nd ref='-87079' />
+ <nd ref='-87081' />
+ <nd ref='-87083' />
+ <nd ref='-87085' />
+ <nd ref='-87087' />
+ <nd ref='-87171' />
+ <nd ref='-87175' />
+ <nd ref='-87179' />
+ <nd ref='-87185' />
+ <nd ref='-87187' />
+ <nd ref='-87189' />
+ <nd ref='-87191' />
+ <nd ref='-87193' />
+ <nd ref='-87195' />
+ <nd ref='-87197' />
+ <nd ref='-87199' />
+ <nd ref='-87201' />
+ <nd ref='-85656' />
+ <nd ref='-85658' />
+ <nd ref='-85660' />
+ <nd ref='-85662' />
+ <nd ref='-85664' />
+ <nd ref='-85666' />
+ <nd ref='-85668' />
+ <nd ref='-85670' />
+ <nd ref='-7904' />
+ <nd ref='-10458' />
+ <nd ref='-86707' />
+ <nd ref='-86705' />
+ <nd ref='-86703' />
+ <nd ref='-86701' />
+ <nd ref='-86699' />
+ <nd ref='-86697' />
+ <nd ref='-86695' />
+ <nd ref='-86693' />
+ <nd ref='-86691' />
+ <nd ref='-86689' />
+ <nd ref='-86687' />
+ <nd ref='-86685' />
+ <nd ref='-86683' />
+ <nd ref='-86681' />
+ <nd ref='-86679' />
+ <nd ref='-86677' />
+ <nd ref='-90091' />
+ <nd ref='-90093' />
+ <nd ref='-90095' />
+ <nd ref='-90097' />
+ <nd ref='-90099' />
+ <nd ref='-90101' />
+ <nd ref='-90103' />
+ <nd ref='-90105' />
+ <nd ref='-90107' />
+ <nd ref='-90109' />
+ <nd ref='-90111' />
+ <nd ref='-90113' />
+ <nd ref='-90115' />
+ <nd ref='-90143' />
+ <nd ref='-90145' />
+ <nd ref='-90147' />
+ <nd ref='-90149' />
+ <nd ref='-90151' />
+ <nd ref='-90153' />
+ <nd ref='-90155' />
+ <nd ref='-90157' />
+ <nd ref='-90159' />
+ <nd ref='-90161' />
+ <nd ref='-90163' />
+ <nd ref='-90165' />
+ <nd ref='-90167' />
+ <nd ref='-90169' />
+ <nd ref='-90171' />
+ <nd ref='-90173' />
+ <nd ref='-90175' />
+ <nd ref='-90177' />
+ <nd ref='-90179' />
+ <nd ref='-90181' />
+ <nd ref='-90183' />
+ <nd ref='-90185' />
+ <nd ref='-90187' />
+ <nd ref='-90189' />
+ <nd ref='-90191' />
+ <nd ref='-90193' />
+ <nd ref='-90195' />
+ <nd ref='-89370' />
+ <nd ref='-89368' />
+ <nd ref='-89366' />
+ <nd ref='-89364' />
+ <nd ref='-89362' />
+ <nd ref='-89360' />
+ <nd ref='-89358' />
+ <nd ref='-89356' />
+ <nd ref='-89354' />
+ <nd ref='-89352' />
+ <nd ref='-89350' />
+ <nd ref='-89348' />
+ <nd ref='-89346' />
+ <nd ref='-89344' />
+ <nd ref='-89342' />
+ <nd ref='-89340' />
+ <nd ref='-89338' />
+ <tag k='ISO3166-2' v='CN-62' />
+ <tag k='name:en' v='Gansu' />
+ </way>
+ <way id='-90235'>
+ <nd ref='-90115' />
+ <nd ref='-90234' />
+ <nd ref='-90119' />
+ <nd ref='-86635' />
+ <nd ref='-86641' />
+ <nd ref='-86647' />
+ <nd ref='-86653' />
+ <nd ref='-86655' />
+ <nd ref='-86663' />
+ <nd ref='-86665' />
+ <nd ref='-86667' />
+ <nd ref='-86669' />
+ <nd ref='-86671' />
+ <nd ref='-86673' />
+ <nd ref='-86675' />
+ <nd ref='-86677' />
+ <nd ref='-90091' />
+ <nd ref='-90093' />
+ <nd ref='-90095' />
+ <nd ref='-90097' />
+ <nd ref='-90099' />
+ <nd ref='-90101' />
+ <nd ref='-90103' />
+ <nd ref='-90105' />
+ <nd ref='-90107' />
+ <nd ref='-90109' />
+ <nd ref='-90111' />
+ <nd ref='-90113' />
+ <nd ref='-90115' />
+ <tag k='ISO3166-2' v='CN-64' />
+ <tag k='name:en' v='Ningxia' />
+ </way>
+ <way id='-90295'>
+ <nd ref='-86297' />
+ <nd ref='-90294' />
+ <nd ref='-90296' />
+ <nd ref='-90298' />
+ <nd ref='-90300' />
+ <nd ref='-90302' />
+ <nd ref='-90304' />
+ <nd ref='-90306' />
+ <nd ref='-90308' />
+ <nd ref='-90310' />
+ <nd ref='-90312' />
+ <nd ref='-90314' />
+ <nd ref='-90316' />
+ <nd ref='-90318' />
+ <nd ref='-90320' />
+ <nd ref='-90322' />
+ <nd ref='-90324' />
+ <nd ref='-12914' />
+ <nd ref='-12912' />
+ <nd ref='-12916' />
+ <nd ref='-12918' />
+ <nd ref='-12922' />
+ <nd ref='-12920' />
+ <nd ref='-7732' />
+ <nd ref='-12924' />
+ <nd ref='-12926' />
+ <nd ref='-12928' />
+ <nd ref='-12930' />
+ <nd ref='-12932' />
+ <nd ref='-12936' />
+ <nd ref='-12934' />
+ <nd ref='-7730' />
+ <nd ref='-7728' />
+ <nd ref='-12938' />
+ <nd ref='-7726' />
+ <nd ref='-12940' />
+ <nd ref='-12942' />
+ <nd ref='-12944' />
+ <nd ref='-12946' />
+ <nd ref='-12948' />
+ <nd ref='-27886' />
+ <nd ref='-7724' />
+ <nd ref='-12950' />
+ <nd ref='-12952' />
+ <nd ref='-7722' />
+ <nd ref='-7720' />
+ <nd ref='-12954' />
+ <nd ref='-12956' />
+ <nd ref='-12958' />
+ <nd ref='-12960' />
+ <nd ref='-12962' />
+ <nd ref='-27884' />
+ <nd ref='-12964' />
+ <nd ref='-12966' />
+ <nd ref='-12968' />
+ <nd ref='-12970' />
+ <nd ref='-27882' />
+ <nd ref='-27880' />
+ <nd ref='-27878' />
+ <nd ref='-12972' />
+ <nd ref='-12984' />
+ <nd ref='-12982' />
+ <nd ref='-12980' />
+ <nd ref='-12978' />
+ <nd ref='-12976' />
+ <nd ref='-27876' />
+ <nd ref='-12974' />
+ <nd ref='-27874' />
+ <nd ref='-27872' />
+ <nd ref='-12986' />
+ <nd ref='-27866' />
+ <nd ref='-27868' />
+ <nd ref='-27870' />
+ <nd ref='-12992' />
+ <nd ref='-12990' />
+ <nd ref='-12988' />
+ <nd ref='-12994' />
+ <nd ref='-12996' />
+ <nd ref='-7718' />
+ <nd ref='-12998' />
+ <nd ref='-27864' />
+ <nd ref='-27862' />
+ <nd ref='-27860' />
+ <nd ref='-13000' />
+ <nd ref='-27858' />
+ <nd ref='-13002' />
+ <nd ref='-13004' />
+ <nd ref='-7716' />
+ <nd ref='-7714' />
+ <nd ref='-13008' />
+ <nd ref='-13006' />
+ <nd ref='-13012' />
+ <nd ref='-13010' />
+ <nd ref='-13014' />
+ <nd ref='-7976' />
+ <nd ref='-7974' />
+ <nd ref='-13016' />
+ <nd ref='-7972' />
+ <nd ref='-86237' />
+ <nd ref='-86239' />
+ <nd ref='-86241' />
+ <nd ref='-86243' />
+ <nd ref='-86245' />
+ <nd ref='-86247' />
+ <nd ref='-86249' />
+ <nd ref='-86251' />
+ <nd ref='-86253' />
+ <nd ref='-86255' />
+ <nd ref='-86257' />
+ <nd ref='-86259' />
+ <nd ref='-86261' />
+ <nd ref='-86263' />
+ <nd ref='-86265' />
+ <nd ref='-86267' />
+ <nd ref='-86269' />
+ <nd ref='-86271' />
+ <nd ref='-86273' />
+ <nd ref='-86275' />
+ <nd ref='-86277' />
+ <nd ref='-86279' />
+ <nd ref='-86281' />
+ <nd ref='-86283' />
+ <nd ref='-86285' />
+ <nd ref='-86287' />
+ <nd ref='-86289' />
+ <nd ref='-86291' />
+ <nd ref='-86293' />
+ <nd ref='-86295' />
+ <nd ref='-86297' />
+ <tag k='ISO3166-2' v='CN-23' />
+ <tag k='name:en' v='Heilongjiang' />
+ </way>
+ <way id='-90451'>
+ <nd ref='-86347' />
+ <nd ref='-90450' />
+ <nd ref='-90452' />
+ <nd ref='-90454' />
+ <nd ref='-90456' />
+ <nd ref='-90458' />
+ <nd ref='-90460' />
+ <nd ref='-90462' />
+ <nd ref='-90464' />
+ <nd ref='-90466' />
+ <nd ref='-90468' />
+ <nd ref='-90470' />
+ <nd ref='-90472' />
+ <nd ref='-90474' />
+ <nd ref='-90476' />
+ <nd ref='-90478' />
+ <nd ref='-90480' />
+ <nd ref='-90482' />
+ <nd ref='-90484' />
+ <nd ref='-90486' />
+ <nd ref='-90488' />
+ <nd ref='-90490' />
+ <nd ref='-90492' />
+ <nd ref='-90494' />
+ <nd ref='-90496' />
+ <nd ref='-90498' />
+ <nd ref='-90500' />
+ <nd ref='-90502' />
+ <nd ref='-12852' />
+ <nd ref='-12854' />
+ <nd ref='-27302' />
+ <nd ref='-12856' />
+ <nd ref='-12858' />
+ <nd ref='-7750' />
+ <nd ref='-27300' />
+ <nd ref='-12860' />
+ <nd ref='-27298' />
+ <nd ref='-27296' />
+ <nd ref='-27294' />
+ <nd ref='-27292' />
+ <nd ref='-27290' />
+ <nd ref='-7748' />
+ <nd ref='-7746' />
+ <nd ref='-12862' />
+ <nd ref='-7744' />
+ <nd ref='-7742' />
+ <nd ref='-7740' />
+ <nd ref='-12868' />
+ <nd ref='-27288' />
+ <nd ref='-27286' />
+ <nd ref='-12866' />
+ <nd ref='-12870' />
+ <nd ref='-12872' />
+ <nd ref='-12874' />
+ <nd ref='-12864' />
+ <nd ref='-27284' />
+ <nd ref='-27278' />
+ <nd ref='-27280' />
+ <nd ref='-27282' />
+ <nd ref='-27276' />
+ <nd ref='-7738' />
+ <nd ref='-27274' />
+ <nd ref='-12876' />
+ <nd ref='-27272' />
+ <nd ref='-27268' />
+ <nd ref='-27270' />
+ <nd ref='-7736' />
+ <nd ref='-27266' />
+ <nd ref='-12878' />
+ <nd ref='-12884' />
+ <nd ref='-12882' />
+ <nd ref='-12880' />
+ <nd ref='-27264' />
+ <nd ref='-12890' />
+ <nd ref='-12892' />
+ <nd ref='-12894' />
+ <nd ref='-12896' />
+ <nd ref='-7734' />
+ <nd ref='-12898' />
+ <nd ref='-12902' />
+ <nd ref='-12900' />
+ <nd ref='-12904' />
+ <nd ref='-12910' />
+ <nd ref='-12908' />
+ <nd ref='-12906' />
+ <nd ref='-12914' />
+ <nd ref='-90324' />
+ <nd ref='-90322' />
+ <nd ref='-90320' />
+ <nd ref='-90318' />
+ <nd ref='-90316' />
+ <nd ref='-90314' />
+ <nd ref='-90312' />
+ <nd ref='-90310' />
+ <nd ref='-90308' />
+ <nd ref='-90306' />
+ <nd ref='-90304' />
+ <nd ref='-90302' />
+ <nd ref='-90300' />
+ <nd ref='-90298' />
+ <nd ref='-90296' />
+ <nd ref='-90294' />
+ <nd ref='-86297' />
+ <nd ref='-86299' />
+ <nd ref='-86301' />
+ <nd ref='-86303' />
+ <nd ref='-86305' />
+ <nd ref='-86307' />
+ <nd ref='-86309' />
+ <nd ref='-86311' />
+ <nd ref='-86313' />
+ <nd ref='-86315' />
+ <nd ref='-86317' />
+ <nd ref='-86319' />
+ <nd ref='-86321' />
+ <nd ref='-86323' />
+ <nd ref='-86325' />
+ <nd ref='-86327' />
+ <nd ref='-86329' />
+ <nd ref='-86331' />
+ <nd ref='-86333' />
+ <nd ref='-86335' />
+ <nd ref='-86337' />
+ <nd ref='-86339' />
+ <nd ref='-86341' />
+ <nd ref='-86343' />
+ <nd ref='-86345' />
+ <nd ref='-86347' />
+ <tag k='ISO3166-2' v='CN-22' />
+ <tag k='name:en' v='Jilin' />
+ </way>
+ <way id='-90625'>
+ <nd ref='-10870' />
+ <nd ref='-90624' />
+ <nd ref='-101621' />
+ <nd ref='-90626' />
+ <nd ref='-90628' />
+ <nd ref='-90630' />
+ <nd ref='-90632' />
+ <nd ref='-90634' />
+ <nd ref='-90636' />
+ <nd ref='-90638' />
+ <nd ref='-90640' />
+ <nd ref='-90642' />
+ <nd ref='-90644' />
+ <nd ref='-90646' />
+ <nd ref='-90648' />
+ <nd ref='-86403' />
+ <nd ref='-86401' />
+ <nd ref='-86399' />
+ <nd ref='-86397' />
+ <nd ref='-86395' />
+ <nd ref='-86393' />
+ <nd ref='-86391' />
+ <nd ref='-86389' />
+ <nd ref='-86387' />
+ <nd ref='-86385' />
+ <nd ref='-86383' />
+ <nd ref='-86381' />
+ <nd ref='-86379' />
+ <nd ref='-86377' />
+ <nd ref='-86375' />
+ <nd ref='-86373' />
+ <nd ref='-86371' />
+ <nd ref='-86369' />
+ <nd ref='-86367' />
+ <nd ref='-86365' />
+ <nd ref='-86363' />
+ <nd ref='-86361' />
+ <nd ref='-86359' />
+ <nd ref='-86357' />
+ <nd ref='-86355' />
+ <nd ref='-86353' />
+ <nd ref='-86351' />
+ <nd ref='-86349' />
+ <nd ref='-86347' />
+ <nd ref='-90450' />
+ <nd ref='-90452' />
+ <nd ref='-90454' />
+ <nd ref='-90456' />
+ <nd ref='-90458' />
+ <nd ref='-90460' />
+ <nd ref='-90462' />
+ <nd ref='-90464' />
+ <nd ref='-90466' />
+ <nd ref='-90468' />
+ <nd ref='-90470' />
+ <nd ref='-90472' />
+ <nd ref='-90474' />
+ <nd ref='-90476' />
+ <nd ref='-90478' />
+ <nd ref='-90480' />
+ <nd ref='-90482' />
+ <nd ref='-90484' />
+ <nd ref='-90486' />
+ <nd ref='-90488' />
+ <nd ref='-90490' />
+ <nd ref='-90492' />
+ <nd ref='-90494' />
+ <nd ref='-90496' />
+ <nd ref='-90498' />
+ <nd ref='-90500' />
+ <nd ref='-90502' />
+ <nd ref='-12850' />
+ <nd ref='-27304' />
+ <nd ref='-7752' />
+ <nd ref='-7754' />
+ <nd ref='-27308' />
+ <nd ref='-27306' />
+ <nd ref='-27310' />
+ <nd ref='-12220' />
+ <nd ref='-10870' />
+ <tag k='ISO3166-2' v='CN-21' />
+ <tag k='name:en' v='Liaoning' />
+ </way>
+ <way id='-90752'>
+ <nd ref='-90878' />
+ <nd ref='-90757' />
+ <nd ref='-90759' />
+ <nd ref='-90761' />
+ <nd ref='-90763' />
+ <nd ref='-90765' />
+ <nd ref='-90767' />
+ <nd ref='-90769' />
+ <nd ref='-90771' />
+ <nd ref='-90773' />
+ <nd ref='-90775' />
+ <nd ref='-90777' />
+ <nd ref='-90779' />
+ <nd ref='-90781' />
+ <nd ref='-90783' />
+ <nd ref='-90785' />
+ <nd ref='-90787' />
+ <nd ref='-90789' />
+ <nd ref='-90791' />
+ <nd ref='-90793' />
+ <nd ref='-90795' />
+ <nd ref='-90797' />
+ <nd ref='-90799' />
+ <nd ref='-90801' />
+ <nd ref='-90803' />
+ <nd ref='-90805' />
+ <nd ref='-90807' />
+ <nd ref='-90809' />
+ <nd ref='-90811' />
+ <nd ref='-90813' />
+ <nd ref='-90815' />
+ <nd ref='-90817' />
+ <nd ref='-90819' />
+ <nd ref='-90821' />
+ <nd ref='-90823' />
+ <nd ref='-90825' />
+ <nd ref='-90827' />
+ <nd ref='-90829' />
+ <nd ref='-90831' />
+ <nd ref='-90833' />
+ <nd ref='-90835' />
+ <nd ref='-90837' />
+ <nd ref='-90839' />
+ <nd ref='-90841' />
+ <nd ref='-90843' />
+ <nd ref='-90845' />
+ <nd ref='-90847' />
+ <nd ref='-90849' />
+ <nd ref='-90851' />
+ <nd ref='-90853' />
+ <nd ref='-90855' />
+ <nd ref='-90857' />
+ <nd ref='-90859' />
+ <nd ref='-90861' />
+ <nd ref='-90863' />
+ <nd ref='-90869' />
+ <nd ref='-90871' />
+ <nd ref='-90873' />
+ <nd ref='-90875' />
+ <nd ref='-92422' />
+ <nd ref='-92270' />
+ <nd ref='-92271' />
+ <nd ref='-92273' />
+ <nd ref='-92478' />
+ <nd ref='-92438' />
+ <nd ref='-90878' />
+ <tag k='ISO3166-2' v='IN-KL' />
+ <tag k='name:en' v='Kerala' />
+ </way>
+ <way id='-90894'>
+ <nd ref='-90873' />
+ <nd ref='-90871' />
+ <nd ref='-90869' />
+ <nd ref='-90863' />
+ <nd ref='-90861' />
+ <nd ref='-90859' />
+ <nd ref='-90857' />
+ <nd ref='-90855' />
+ <nd ref='-90853' />
+ <nd ref='-90851' />
+ <nd ref='-90849' />
+ <nd ref='-90847' />
+ <nd ref='-90845' />
+ <nd ref='-90843' />
+ <nd ref='-90841' />
+ <nd ref='-90839' />
+ <nd ref='-90837' />
+ <nd ref='-90835' />
+ <nd ref='-90833' />
+ <nd ref='-90831' />
+ <nd ref='-90829' />
+ <nd ref='-90827' />
+ <nd ref='-90825' />
+ <nd ref='-90823' />
+ <nd ref='-90821' />
+ <nd ref='-90819' />
+ <nd ref='-90817' />
+ <nd ref='-90815' />
+ <nd ref='-90813' />
+ <nd ref='-90924' />
+ <nd ref='-90926' />
+ <nd ref='-90928' />
+ <nd ref='-90930' />
+ <nd ref='-90932' />
+ <nd ref='-90934' />
+ <nd ref='-90936' />
+ <nd ref='-90938' />
+ <nd ref='-90940' />
+ <nd ref='-90942' />
+ <nd ref='-90944' />
+ <nd ref='-90946' />
+ <nd ref='-90948' />
+ <nd ref='-90950' />
+ <nd ref='-90952' />
+ <nd ref='-90954' />
+ <nd ref='-90956' />
+ <nd ref='-90958' />
+ <nd ref='-90960' />
+ <nd ref='-90962' />
+ <nd ref='-90964' />
+ <nd ref='-90966' />
+ <nd ref='-90968' />
+ <nd ref='-90970' />
+ <nd ref='-90972' />
+ <nd ref='-90974' />
+ <nd ref='-90976' />
+ <nd ref='-90978' />
+ <nd ref='-90980' />
+ <nd ref='-90982' />
+ <nd ref='-90984' />
+ <nd ref='-90986' />
+ <nd ref='-90988' />
+ <nd ref='-90990' />
+ <nd ref='-90994' />
+ <nd ref='-90996' />
+ <nd ref='-90998' />
+ <nd ref='-91002' />
+ <nd ref='-91008' />
+ <nd ref='-91010' />
+ <nd ref='-91012' />
+ <nd ref='-91014' />
+ <nd ref='-91018' />
+ <nd ref='-91020' />
+ <nd ref='-91022' />
+ <nd ref='-91054' />
+ <nd ref='-91056' />
+ <nd ref='-91058' />
+ <nd ref='-91060' />
+ <nd ref='-91062' />
+ <nd ref='-91064' />
+ <nd ref='-91066' />
+ <nd ref='-91068' />
+ <nd ref='-91070' />
+ <nd ref='-91072' />
+ <nd ref='-91074' />
+ <nd ref='-91082' />
+ <nd ref='-91084' />
+ <nd ref='-91090' />
+ <nd ref='-91092' />
+ <nd ref='-91094' />
+ <nd ref='-91096' />
+ <nd ref='-91098' />
+ <nd ref='-91100' />
+ <nd ref='-91102' />
+ <nd ref='-91104' />
+ <nd ref='-91106' />
+ <nd ref='-91108' />
+ <nd ref='-91110' />
+ <nd ref='-91112' />
+ <nd ref='-91114' />
+ <nd ref='-91116' />
+ <nd ref='-91118' />
+ <nd ref='-91120' />
+ <nd ref='-91122' />
+ <nd ref='-91124' />
+ <nd ref='-91126' />
+ <nd ref='-91128' />
+ <nd ref='-91130' />
+ <nd ref='-91132' />
+ <nd ref='-91134' />
+ <nd ref='-91136' />
+ <nd ref='-91138' />
+ <nd ref='-91140' />
+ <nd ref='-91142' />
+ <nd ref='-91144' />
+ <nd ref='-91146' />
+ <nd ref='-91148' />
+ <nd ref='-91150' />
+ <nd ref='-91152' />
+ <nd ref='-91154' />
+ <nd ref='-91156' />
+ <nd ref='-91158' />
+ <nd ref='-91160' />
+ <nd ref='-91162' />
+ <nd ref='-91164' />
+ <nd ref='-91166' />
+ <nd ref='-91168' />
+ <nd ref='-91170' />
+ <nd ref='-91172' />
+ <nd ref='-91174' />
+ <nd ref='-91176' />
+ <nd ref='-91178' />
+ <nd ref='-91180' />
+ <nd ref='-91182' />
+ <nd ref='-91184' />
+ <nd ref='-91186' />
+ <nd ref='-91188' />
+ <nd ref='-91190' />
+ <nd ref='-91192' />
+ <nd ref='-91196' />
+ <nd ref='-91198' />
+ <nd ref='-91200' />
+ <nd ref='-91202' />
+ <nd ref='-91206' />
+ <nd ref='-91208' />
+ <nd ref='-91212' />
+ <nd ref='-91214' />
+ <nd ref='-91216' />
+ <nd ref='-91218' />
+ <nd ref='-91220' />
+ <nd ref='-91222' />
+ <nd ref='-91226' />
+ <nd ref='-91228' />
+ <nd ref='-91230' />
+ <nd ref='-91232' />
+ <nd ref='-91234' />
+ <nd ref='-91236' />
+ <nd ref='-91240' />
+ <nd ref='-91242' />
+ <nd ref='-91244' />
+ <nd ref='-91246' />
+ <nd ref='-91250' />
+ <nd ref='-91252' />
+ <nd ref='-91254' />
+ <nd ref='-91256' />
+ <nd ref='-91264' />
+ <nd ref='-91266' />
+ <nd ref='-91268' />
+ <nd ref='-91270' />
+ <nd ref='-91272' />
+ <nd ref='-91274' />
+ <nd ref='-91280' />
+ <nd ref='-91282' />
+ <nd ref='-91284' />
+ <nd ref='-91286' />
+ <nd ref='-91288' />
+ <nd ref='-91290' />
+ <nd ref='-91292' />
+ <nd ref='-91294' />
+ <nd ref='-91298' />
+ <nd ref='-91304' />
+ <nd ref='-91306' />
+ <nd ref='-91308' />
+ <nd ref='-91310' />
+ <nd ref='-91312' />
+ <nd ref='-91314' />
+ <nd ref='-91316' />
+ <nd ref='-91318' />
+ <nd ref='-91322' />
+ <nd ref='-91324' />
+ <nd ref='-91326' />
+ <nd ref='-91328' />
+ <nd ref='-91330' />
+ <nd ref='-91334' />
+ <nd ref='-91336' />
+ <nd ref='-91338' />
+ <nd ref='-91340' />
+ <nd ref='-91342' />
+ <nd ref='-91344' />
+ <nd ref='-91346' />
+ <nd ref='-91350' />
+ <nd ref='-91352' />
+ <nd ref='-91440' />
+ <nd ref='-91445' />
+ <nd ref='-91447' />
+ <nd ref='-91449' />
+ <nd ref='-91451' />
+ <nd ref='-91453' />
+ <nd ref='-91455' />
+ <nd ref='-91457' />
+ <nd ref='-91459' />
+ <nd ref='-91461' />
+ <nd ref='-91463' />
+ <nd ref='-91473' />
+ <nd ref='-91475' />
+ <nd ref='-91477' />
+ <nd ref='-91481' />
+ <nd ref='-91483' />
+ <nd ref='-91485' />
+ <nd ref='-91487' />
+ <nd ref='-91489' />
+ <nd ref='-91491' />
+ <nd ref='-91493' />
+ <nd ref='-91495' />
+ <nd ref='-91497' />
+ <nd ref='-91499' />
+ <nd ref='-91501' />
+ <nd ref='-91503' />
+ <nd ref='-91505' />
+ <nd ref='-91509' />
+ <nd ref='-91511' />
+ <nd ref='-91513' />
+ <nd ref='-91519' />
+ <nd ref='-91525' />
+ <nd ref='-91527' />
+ <nd ref='-91529' />
+ <nd ref='-91531' />
+ <nd ref='-91533' />
+ <nd ref='-91535' />
+ <nd ref='-91537' />
+ <nd ref='-91539' />
+ <nd ref='-91541' />
+ <nd ref='-91543' />
+ <nd ref='-91547' />
+ <nd ref='-91549' />
+ <nd ref='-91551' />
+ <nd ref='-91553' />
+ <nd ref='-91555' />
+ <nd ref='-91557' />
+ <nd ref='-91559' />
+ <nd ref='-91561' />
+ <nd ref='-91563' />
+ <nd ref='-91565' />
+ <nd ref='-91567' />
+ <nd ref='-91569' />
+ <nd ref='-91571' />
+ <nd ref='-91575' />
+ <nd ref='-91577' />
+ <nd ref='-91579' />
+ <nd ref='-91581' />
+ <nd ref='-91585' />
+ <nd ref='-91587' />
+ <nd ref='-91589' />
+ <nd ref='-91591' />
+ <nd ref='-91593' />
+ <nd ref='-91595' />
+ <nd ref='-91597' />
+ <nd ref='-91599' />
+ <nd ref='-91601' />
+ <nd ref='-91603' />
+ <nd ref='-91605' />
+ <nd ref='-91607' />
+ <nd ref='-91609' />
+ <nd ref='-91611' />
+ <nd ref='-91613' />
+ <nd ref='-91615' />
+ <nd ref='-91617' />
+ <nd ref='-91619' />
+ <nd ref='-91621' />
+ <nd ref='-91623' />
+ <nd ref='-91625' />
+ <nd ref='-91627' />
+ <nd ref='-91629' />
+ <nd ref='-91631' />
+ <nd ref='-91633' />
+ <nd ref='-91635' />
+ <nd ref='-91637' />
+ <nd ref='-91639' />
+ <nd ref='-91641' />
+ <nd ref='-91643' />
+ <nd ref='-91645' />
+ <nd ref='-91647' />
+ <nd ref='-91649' />
+ <nd ref='-91651' />
+ <nd ref='-90875' />
+ <nd ref='-90873' />
+ <tag k='ISO3166-2' v='IN-KA' />
+ <tag k='name:en' v='Karnataka' />
+ </way>
+ <way id='-91443'>
+ <nd ref='-91440' />
+ <nd ref='-91358' />
+ <nd ref='-91360' />
+ <nd ref='-91362' />
+ <nd ref='-91364' />
+ <nd ref='-91366' />
+ <nd ref='-91368' />
+ <nd ref='-91370' />
+ <nd ref='-91372' />
+ <nd ref='-91374' />
+ <nd ref='-91376' />
+ <nd ref='-91378' />
+ <nd ref='-91380' />
+ <nd ref='-91382' />
+ <nd ref='-91384' />
+ <nd ref='-91386' />
+ <nd ref='-91396' />
+ <nd ref='-91398' />
+ <nd ref='-91400' />
+ <nd ref='-91402' />
+ <nd ref='-91404' />
+ <nd ref='-91406' />
+ <nd ref='-91408' />
+ <nd ref='-91416' />
+ <nd ref='-91418' />
+ <nd ref='-91420' />
+ <nd ref='-91422' />
+ <nd ref='-91424' />
+ <nd ref='-91432' />
+ <nd ref='-91434' />
+ <nd ref='-91436' />
+ <nd ref='-91438' />
+ <nd ref='-91725' />
+ <nd ref='-91727' />
+ <nd ref='-91731' />
+ <nd ref='-91733' />
+ <nd ref='-91735' />
+ <nd ref='-91737' />
+ <nd ref='-91741' />
+ <nd ref='-91743' />
+ <nd ref='-91745' />
+ <nd ref='-91747' />
+ <nd ref='-91749' />
+ <nd ref='-91751' />
+ <nd ref='-91753' />
+ <nd ref='-91755' />
+ <nd ref='-91757' />
+ <nd ref='-91759' />
+ <nd ref='-91761' />
+ <nd ref='-91763' />
+ <nd ref='-91765' />
+ <nd ref='-91771' />
+ <nd ref='-91773' />
+ <nd ref='-91775' />
+ <nd ref='-91777' />
+ <nd ref='-91779' />
+ <nd ref='-91781' />
+ <nd ref='-91783' />
+ <nd ref='-91785' />
+ <nd ref='-91793' />
+ <nd ref='-91799' />
+ <nd ref='-91801' />
+ <nd ref='-91803' />
+ <nd ref='-91813' />
+ <nd ref='-91815' />
+ <nd ref='-91819' />
+ <nd ref='-91821' />
+ <nd ref='-91823' />
+ <nd ref='-91274' />
+ <nd ref='-91280' />
+ <nd ref='-91282' />
+ <nd ref='-91284' />
+ <nd ref='-91286' />
+ <nd ref='-91288' />
+ <nd ref='-91290' />
+ <nd ref='-91292' />
+ <nd ref='-91294' />
+ <nd ref='-91298' />
+ <nd ref='-91304' />
+ <nd ref='-91306' />
+ <nd ref='-91308' />
+ <nd ref='-91310' />
+ <nd ref='-91312' />
+ <nd ref='-91314' />
+ <nd ref='-91316' />
+ <nd ref='-91318' />
+ <nd ref='-91322' />
+ <nd ref='-91324' />
+ <nd ref='-91326' />
+ <nd ref='-91328' />
+ <nd ref='-91330' />
+ <nd ref='-91334' />
+ <nd ref='-91336' />
+ <nd ref='-91338' />
+ <nd ref='-91340' />
+ <nd ref='-91342' />
+ <nd ref='-91344' />
+ <nd ref='-91346' />
+ <nd ref='-91350' />
+ <nd ref='-91352' />
+ <nd ref='-91440' />
+ <tag k='ISO3166-2' v='IN-TG' />
+ <tag k='name:en' v='Telangana' />
+ </way>
+ <way id='-91682'>
+ <nd ref='-91651' />
+ <nd ref='-91649' />
+ <nd ref='-91647' />
+ <nd ref='-91645' />
+ <nd ref='-91643' />
+ <nd ref='-91641' />
+ <nd ref='-91639' />
+ <nd ref='-91637' />
+ <nd ref='-91635' />
+ <nd ref='-91633' />
+ <nd ref='-91631' />
+ <nd ref='-91692' />
+ <nd ref='-91694' />
+ <nd ref='-91696' />
+ <nd ref='-91704' />
+ <nd ref='-91708' />
+ <nd ref='-91710' />
+ <nd ref='-91651' />
+ <tag k='ISO3166-2' v='IN-GA' />
+ <tag k='name:en' v='Goa' />
+ </way>
+ <way id='-91879'>
+ <nd ref='-91735' />
+ <nd ref='-91878' />
+ <nd ref='-91880' />
+ <nd ref='-91882' />
+ <nd ref='-91884' />
+ <nd ref='-91886' />
+ <nd ref='-91888' />
+ <nd ref='-91890' />
+ <nd ref='-91892' />
+ <nd ref='-91894' />
+ <nd ref='-91896' />
+ <nd ref='-91898' />
+ <nd ref='-91900' />
+ <nd ref='-91902' />
+ <nd ref='-91904' />
+ <nd ref='-91906' />
+ <nd ref='-91908' />
+ <nd ref='-91910' />
+ <nd ref='-91912' />
+ <nd ref='-91914' />
+ <nd ref='-91916' />
+ <nd ref='-91918' />
+ <nd ref='-91920' />
+ <nd ref='-91922' />
+ <nd ref='-91924' />
+ <nd ref='-92285' />
+ <nd ref='-92283' />
+ <nd ref='-92282' />
+ <nd ref='-92287' />
+ <nd ref='-91926' />
+ <nd ref='-91928' />
+ <nd ref='-91930' />
+ <nd ref='-91932' />
+ <nd ref='-91934' />
+ <nd ref='-91936' />
+ <nd ref='-91938' />
+ <nd ref='-91940' />
+ <nd ref='-91942' />
+ <nd ref='-91944' />
+ <nd ref='-91946' />
+ <nd ref='-91948' />
+ <nd ref='-91950' />
+ <nd ref='-91952' />
+ <nd ref='-91954' />
+ <nd ref='-91956' />
+ <nd ref='-91056' />
+ <nd ref='-91058' />
+ <nd ref='-91060' />
+ <nd ref='-91062' />
+ <nd ref='-91064' />
+ <nd ref='-91066' />
+ <nd ref='-91068' />
+ <nd ref='-91070' />
+ <nd ref='-91072' />
+ <nd ref='-91074' />
+ <nd ref='-91082' />
+ <nd ref='-91084' />
+ <nd ref='-91090' />
+ <nd ref='-91092' />
+ <nd ref='-91094' />
+ <nd ref='-91096' />
+ <nd ref='-91098' />
+ <nd ref='-91100' />
+ <nd ref='-91102' />
+ <nd ref='-91104' />
+ <nd ref='-91106' />
+ <nd ref='-91108' />
+ <nd ref='-91110' />
+ <nd ref='-91112' />
+ <nd ref='-91114' />
+ <nd ref='-91116' />
+ <nd ref='-91118' />
+ <nd ref='-91120' />
+ <nd ref='-91122' />
+ <nd ref='-91124' />
+ <nd ref='-91126' />
+ <nd ref='-91128' />
+ <nd ref='-91130' />
+ <nd ref='-91132' />
+ <nd ref='-91134' />
+ <nd ref='-91136' />
+ <nd ref='-91138' />
+ <nd ref='-91140' />
+ <nd ref='-91142' />
+ <nd ref='-91144' />
+ <nd ref='-91146' />
+ <nd ref='-91148' />
+ <nd ref='-91150' />
+ <nd ref='-91152' />
+ <nd ref='-91154' />
+ <nd ref='-91156' />
+ <nd ref='-91158' />
+ <nd ref='-91160' />
+ <nd ref='-91162' />
+ <nd ref='-91164' />
+ <nd ref='-91166' />
+ <nd ref='-91168' />
+ <nd ref='-91170' />
+ <nd ref='-91172' />
+ <nd ref='-91174' />
+ <nd ref='-91176' />
+ <nd ref='-91178' />
+ <nd ref='-91180' />
+ <nd ref='-91182' />
+ <nd ref='-91184' />
+ <nd ref='-91186' />
+ <nd ref='-91188' />
+ <nd ref='-91190' />
+ <nd ref='-91192' />
+ <nd ref='-91196' />
+ <nd ref='-91198' />
+ <nd ref='-91200' />
+ <nd ref='-91202' />
+ <nd ref='-91206' />
+ <nd ref='-91208' />
+ <nd ref='-91212' />
+ <nd ref='-91214' />
+ <nd ref='-91216' />
+ <nd ref='-91218' />
+ <nd ref='-91220' />
+ <nd ref='-91222' />
+ <nd ref='-91226' />
+ <nd ref='-91228' />
+ <nd ref='-91230' />
+ <nd ref='-91232' />
+ <nd ref='-91234' />
+ <nd ref='-91236' />
+ <nd ref='-91240' />
+ <nd ref='-91242' />
+ <nd ref='-91244' />
+ <nd ref='-91246' />
+ <nd ref='-91250' />
+ <nd ref='-91252' />
+ <nd ref='-91254' />
+ <nd ref='-91256' />
+ <nd ref='-91264' />
+ <nd ref='-91266' />
+ <nd ref='-91268' />
+ <nd ref='-91270' />
+ <nd ref='-91272' />
+ <nd ref='-91274' />
+ <nd ref='-91823' />
+ <nd ref='-91821' />
+ <nd ref='-91819' />
+ <nd ref='-91815' />
+ <nd ref='-91813' />
+ <nd ref='-91803' />
+ <nd ref='-91801' />
+ <nd ref='-91799' />
+ <nd ref='-91793' />
+ <nd ref='-91785' />
+ <nd ref='-91783' />
+ <nd ref='-91781' />
+ <nd ref='-91779' />
+ <nd ref='-91777' />
+ <nd ref='-91775' />
+ <nd ref='-91773' />
+ <nd ref='-91771' />
+ <nd ref='-91765' />
+ <nd ref='-91763' />
+ <nd ref='-91761' />
+ <nd ref='-91759' />
+ <nd ref='-91757' />
+ <nd ref='-91755' />
+ <nd ref='-91753' />
+ <nd ref='-91751' />
+ <nd ref='-91749' />
+ <nd ref='-91747' />
+ <nd ref='-91745' />
+ <nd ref='-91743' />
+ <nd ref='-91741' />
+ <nd ref='-91737' />
+ <nd ref='-91735' />
+ <tag k='ISO3166-2' v='IN-AP' />
+ <tag k='name:en' v='Andhra Pradesh' />
+ </way>
+ <way id='-92131'>
+ <nd ref='-91926' />
+ <nd ref='-92250' />
+ <nd ref='-92344' />
+ <nd ref='-92246' />
+ <nd ref='-92245' />
+ <nd ref='-92254' />
+ <nd ref='-92390' />
+ <nd ref='-92257' />
+ <nd ref='-92259' />
+ <nd ref='-11720' />
+ <nd ref='-11722' />
+ <nd ref='-9312' />
+ <nd ref='-11714' />
+ <nd ref='-9314' />
+ <nd ref='-90878' />
+ <nd ref='-90757' />
+ <nd ref='-90759' />
+ <nd ref='-90761' />
+ <nd ref='-90763' />
+ <nd ref='-90765' />
+ <nd ref='-90767' />
+ <nd ref='-90769' />
+ <nd ref='-90771' />
+ <nd ref='-90773' />
+ <nd ref='-90775' />
+ <nd ref='-90777' />
+ <nd ref='-90779' />
+ <nd ref='-90781' />
+ <nd ref='-90783' />
+ <nd ref='-90785' />
+ <nd ref='-90787' />
+ <nd ref='-90789' />
+ <nd ref='-90791' />
+ <nd ref='-90793' />
+ <nd ref='-90795' />
+ <nd ref='-90797' />
+ <nd ref='-90799' />
+ <nd ref='-90801' />
+ <nd ref='-90803' />
+ <nd ref='-90805' />
+ <nd ref='-90807' />
+ <nd ref='-90809' />
+ <nd ref='-90811' />
+ <nd ref='-90813' />
+ <nd ref='-90924' />
+ <nd ref='-90926' />
+ <nd ref='-90928' />
+ <nd ref='-90930' />
+ <nd ref='-90932' />
+ <nd ref='-90934' />
+ <nd ref='-90936' />
+ <nd ref='-90938' />
+ <nd ref='-90940' />
+ <nd ref='-90942' />
+ <nd ref='-90944' />
+ <nd ref='-90946' />
+ <nd ref='-90948' />
+ <nd ref='-90950' />
+ <nd ref='-90952' />
+ <nd ref='-90954' />
+ <nd ref='-90956' />
+ <nd ref='-90958' />
+ <nd ref='-90960' />
+ <nd ref='-90962' />
+ <nd ref='-90964' />
+ <nd ref='-90966' />
+ <nd ref='-90968' />
+ <nd ref='-90970' />
+ <nd ref='-90972' />
+ <nd ref='-90974' />
+ <nd ref='-90976' />
+ <nd ref='-90978' />
+ <nd ref='-90980' />
+ <nd ref='-90982' />
+ <nd ref='-90984' />
+ <nd ref='-90986' />
+ <nd ref='-90988' />
+ <nd ref='-90990' />
+ <nd ref='-90994' />
+ <nd ref='-90996' />
+ <nd ref='-90998' />
+ <nd ref='-91002' />
+ <nd ref='-91008' />
+ <nd ref='-91010' />
+ <nd ref='-91012' />
+ <nd ref='-91014' />
+ <nd ref='-91018' />
+ <nd ref='-91020' />
+ <nd ref='-91022' />
+ <nd ref='-91054' />
+ <nd ref='-91056' />
+ <nd ref='-91956' />
+ <nd ref='-91954' />
+ <nd ref='-91952' />
+ <nd ref='-91950' />
+ <nd ref='-91948' />
+ <nd ref='-91946' />
+ <nd ref='-91944' />
+ <nd ref='-91942' />
+ <nd ref='-91940' />
+ <nd ref='-91938' />
+ <nd ref='-91936' />
+ <nd ref='-91934' />
+ <nd ref='-91932' />
+ <nd ref='-91930' />
+ <nd ref='-91928' />
+ <nd ref='-91926' />
+ <tag k='ISO3166-2' v='IN-TN' />
+ <tag k='name:en' v='Tamil Nadu' />
+ </way>
+ <way id='-92247'>
+ <nd ref='-92245' />
+ <nd ref='-92246' />
+ <nd ref='-92344' />
+ <nd ref='-92250' />
+ <nd ref='-92245' />
+ </way>
+ <way id='-92256'>
+ <nd ref='-92254' />
+ <nd ref='-92390' />
+ <nd ref='-92257' />
+ <nd ref='-92259' />
+ <nd ref='-92254' />
+ </way>
+ <way id='-92272'>
+ <nd ref='-92270' />
+ <nd ref='-92271' />
+ <nd ref='-92273' />
+ <nd ref='-92478' />
+ <nd ref='-92438' />
+ <nd ref='-92422' />
+ <nd ref='-92270' />
+ </way>
+ <way id='-92284'>
+ <nd ref='-92282' />
+ <nd ref='-92283' />
+ <nd ref='-92285' />
+ <nd ref='-92287' />
+ <nd ref='-92282' />
+ </way>
+ <way id='-92581'>
+ <nd ref='-22214' />
+ <nd ref='-92580' />
+ <nd ref='-92582' />
+ <nd ref='-92584' />
+ <nd ref='-92586' />
+ <nd ref='-92588' />
+ <nd ref='-92590' />
+ <nd ref='-92592' />
+ <nd ref='-92594' />
+ <nd ref='-92596' />
+ <nd ref='-92598' />
+ <nd ref='-97883' />
+ <nd ref='-92600' />
+ <nd ref='-92602' />
+ <nd ref='-92604' />
+ <nd ref='-22350' />
+ <nd ref='-22348' />
+ <nd ref='-22346' />
+ <nd ref='-22352' />
+ <nd ref='-9386' />
+ <nd ref='-27550' />
+ <nd ref='-27552' />
+ <nd ref='-9388' />
+ <nd ref='-9390' />
+ <nd ref='-9392' />
+ <nd ref='-22356' />
+ <nd ref='-22364' />
+ <nd ref='-22362' />
+ <nd ref='-22360' />
+ <nd ref='-22358' />
+ <nd ref='-22354' />
+ <nd ref='-22368' />
+ <nd ref='-22366' />
+ <nd ref='-22370' />
+ <nd ref='-22372' />
+ <nd ref='-9394' />
+ <nd ref='-22374' />
+ <nd ref='-22376' />
+ <nd ref='-22378' />
+ <nd ref='-22380' />
+ <nd ref='-9396' />
+ <nd ref='-9398' />
+ <nd ref='-9400' />
+ <nd ref='-27548' />
+ <nd ref='-22382' />
+ <nd ref='-27546' />
+ <nd ref='-22388' />
+ <nd ref='-22390' />
+ <nd ref='-22392' />
+ <nd ref='-22394' />
+ <nd ref='-22386' />
+ <nd ref='-22384' />
+ <nd ref='-22396' />
+ <nd ref='-27544' />
+ <nd ref='-22398' />
+ <nd ref='-22400' />
+ <nd ref='-22404' />
+ <nd ref='-22402' />
+ <nd ref='-22406' />
+ <nd ref='-22408' />
+ <nd ref='-22412' />
+ <nd ref='-22416' />
+ <nd ref='-22414' />
+ <nd ref='-22410' />
+ <nd ref='-9402' />
+ <nd ref='-9404' />
+ <nd ref='-22418' />
+ <nd ref='-9406' />
+ <nd ref='-22420' />
+ <nd ref='-22422' />
+ <nd ref='-9408' />
+ <nd ref='-22434' />
+ <nd ref='-22430' />
+ <nd ref='-22432' />
+ <nd ref='-22424' />
+ <nd ref='-22426' />
+ <nd ref='-22428' />
+ <nd ref='-9410' />
+ <nd ref='-9412' />
+ <nd ref='-9414' />
+ <nd ref='-22440' />
+ <nd ref='-22438' />
+ <nd ref='-22436' />
+ <nd ref='-7832' />
+ <nd ref='-22148' />
+ <nd ref='-22150' />
+ <nd ref='-22152' />
+ <nd ref='-22160' />
+ <nd ref='-22164' />
+ <nd ref='-7830' />
+ <nd ref='-22168' />
+ <nd ref='-22166' />
+ <nd ref='-22172' />
+ <nd ref='-22178' />
+ <nd ref='-7828' />
+ <nd ref='-22194' />
+ <nd ref='-22196' />
+ <nd ref='-22192' />
+ <nd ref='-22190' />
+ <nd ref='-22186' />
+ <nd ref='-22184' />
+ <nd ref='-22182' />
+ <nd ref='-7826' />
+ <nd ref='-22198' />
+ <nd ref='-22202' />
+ <nd ref='-22200' />
+ <nd ref='-7824' />
+ <nd ref='-22204' />
+ <nd ref='-22206' />
+ <nd ref='-22208' />
+ <nd ref='-7822' />
+ <nd ref='-7820' />
+ <nd ref='-7818' />
+ <nd ref='-22212' />
+ <nd ref='-22210' />
+ <nd ref='-22222' />
+ <nd ref='-22216' />
+ <nd ref='-22214' />
+ <tag k='ISO3166-2' v='IN-JK' />
+ <tag k='name:en' v='Jammu and Kashmir' />
+ </way>
+ <way id='-92731'>
+ <nd ref='-22230' />
+ <nd ref='-92730' />
+ <nd ref='-92732' />
+ <nd ref='-92734' />
+ <nd ref='-92736' />
+ <nd ref='-92738' />
+ <nd ref='-92740' />
+ <nd ref='-92742' />
+ <nd ref='-92746' />
+ <nd ref='-92748' />
+ <nd ref='-92750' />
+ <nd ref='-92752' />
+ <nd ref='-92754' />
+ <nd ref='-92756' />
+ <nd ref='-92758' />
+ <nd ref='-92760' />
+ <nd ref='-92762' />
+ <nd ref='-92764' />
+ <nd ref='-92766' />
+ <nd ref='-92768' />
+ <nd ref='-92770' />
+ <nd ref='-92772' />
+ <nd ref='-92774' />
+ <nd ref='-92776' />
+ <nd ref='-92778' />
+ <nd ref='-92780' />
+ <nd ref='-92782' />
+ <nd ref='-10762' />
+ <nd ref='-1600' />
+ <nd ref='-1598' />
+ <nd ref='-1596' />
+ <nd ref='-1592' />
+ <nd ref='-1594' />
+ <nd ref='-1590' />
+ <nd ref='-1602' />
+ <nd ref='-1604' />
+ <nd ref='-27532' />
+ <nd ref='-1606' />
+ <nd ref='-27534' />
+ <nd ref='-1622' />
+ <nd ref='-1610' />
+ <nd ref='-27536' />
+ <nd ref='-1612' />
+ <nd ref='-27538' />
+ <nd ref='-1608' />
+ <nd ref='-1616' />
+ <nd ref='-1614' />
+ <nd ref='-1618' />
+ <nd ref='-1620' />
+ <nd ref='-10764' />
+ <nd ref='-22242' />
+ <nd ref='-22244' />
+ <nd ref='-22246' />
+ <nd ref='-22240' />
+ <nd ref='-22238' />
+ <nd ref='-22236' />
+ <nd ref='-22234' />
+ <nd ref='-22232' />
+ <nd ref='-22230' />
+ <tag k='ISO3166-2' v='IN-UT' />
+ <tag k='name:en' v='Uttarakhand' />
+ </way>
+ <way id='-92838'>
+ <nd ref='-91710' />
+ <nd ref='-92837' />
+ <nd ref='-92839' />
+ <nd ref='-92841' />
+ <nd ref='-92843' />
+ <nd ref='-92859' />
+ <nd ref='-92861' />
+ <nd ref='-92863' />
+ <nd ref='-92865' />
+ <nd ref='-92867' />
+ <nd ref='-92869' />
+ <nd ref='-92871' />
+ <nd ref='-92873' />
+ <nd ref='-92875' />
+ <nd ref='-92877' />
+ <nd ref='-92879' />
+ <nd ref='-92881' />
+ <nd ref='-92883' />
+ <nd ref='-92885' />
+ <nd ref='-92887' />
+ <nd ref='-92889' />
+ <nd ref='-92891' />
+ <nd ref='-92895' />
+ <nd ref='-92897' />
+ <nd ref='-92899' />
+ <nd ref='-92901' />
+ <nd ref='-92903' />
+ <nd ref='-92905' />
+ <nd ref='-92909' />
+ <nd ref='-92911' />
+ <nd ref='-92913' />
+ <nd ref='-92915' />
+ <nd ref='-92917' />
+ <nd ref='-92919' />
+ <nd ref='-92921' />
+ <nd ref='-92923' />
+ <nd ref='-92925' />
+ <nd ref='-92927' />
+ <nd ref='-92929' />
+ <nd ref='-92931' />
+ <nd ref='-92933' />
+ <nd ref='-92937' />
+ <nd ref='-92939' />
+ <nd ref='-92941' />
+ <nd ref='-92943' />
+ <nd ref='-92949' />
+ <nd ref='-92951' />
+ <nd ref='-92953' />
+ <nd ref='-92955' />
+ <nd ref='-92957' />
+ <nd ref='-92959' />
+ <nd ref='-92961' />
+ <nd ref='-92963' />
+ <nd ref='-92965' />
+ <nd ref='-92967' />
+ <nd ref='-92969' />
+ <nd ref='-92971' />
+ <nd ref='-92973' />
+ <nd ref='-92975' />
+ <nd ref='-92983' />
+ <nd ref='-92985' />
+ <nd ref='-92987' />
+ <nd ref='-92989' />
+ <nd ref='-92991' />
+ <nd ref='-92993' />
+ <nd ref='-92995' />
+ <nd ref='-92997' />
+ <nd ref='-92999' />
+ <nd ref='-93001' />
+ <nd ref='-93003' />
+ <nd ref='-93005' />
+ <nd ref='-93007' />
+ <nd ref='-93009' />
+ <nd ref='-93011' />
+ <nd ref='-93013' />
+ <nd ref='-93015' />
+ <nd ref='-93017' />
+ <nd ref='-93019' />
+ <nd ref='-93021' />
+ <nd ref='-93023' />
+ <nd ref='-93025' />
+ <nd ref='-93027' />
+ <nd ref='-93029' />
+ <nd ref='-93031' />
+ <nd ref='-93033' />
+ <nd ref='-93035' />
+ <nd ref='-93037' />
+ <nd ref='-93039' />
+ <nd ref='-93041' />
+ <nd ref='-93043' />
+ <nd ref='-91438' />
+ <nd ref='-91436' />
+ <nd ref='-91434' />
+ <nd ref='-91432' />
+ <nd ref='-91424' />
+ <nd ref='-91422' />
+ <nd ref='-91420' />
+ <nd ref='-91418' />
+ <nd ref='-91416' />
+ <nd ref='-91408' />
+ <nd ref='-91406' />
+ <nd ref='-91404' />
+ <nd ref='-91402' />
+ <nd ref='-91400' />
+ <nd ref='-91398' />
+ <nd ref='-91396' />
+ <nd ref='-91386' />
+ <nd ref='-91384' />
+ <nd ref='-91382' />
+ <nd ref='-91380' />
+ <nd ref='-91378' />
+ <nd ref='-91376' />
+ <nd ref='-91374' />
+ <nd ref='-91372' />
+ <nd ref='-91370' />
+ <nd ref='-91368' />
+ <nd ref='-91366' />
+ <nd ref='-91364' />
+ <nd ref='-91362' />
+ <nd ref='-91360' />
+ <nd ref='-91358' />
+ <nd ref='-91440' />
+ <nd ref='-91445' />
+ <nd ref='-91447' />
+ <nd ref='-91449' />
+ <nd ref='-91451' />
+ <nd ref='-91453' />
+ <nd ref='-91455' />
+ <nd ref='-91457' />
+ <nd ref='-91459' />
+ <nd ref='-91461' />
+ <nd ref='-91463' />
+ <nd ref='-91473' />
+ <nd ref='-91475' />
+ <nd ref='-91477' />
+ <nd ref='-91481' />
+ <nd ref='-91483' />
+ <nd ref='-91485' />
+ <nd ref='-91487' />
+ <nd ref='-91489' />
+ <nd ref='-91491' />
+ <nd ref='-91493' />
+ <nd ref='-91495' />
+ <nd ref='-91497' />
+ <nd ref='-91499' />
+ <nd ref='-91501' />
+ <nd ref='-91503' />
+ <nd ref='-91505' />
+ <nd ref='-91509' />
+ <nd ref='-91511' />
+ <nd ref='-91513' />
+ <nd ref='-91519' />
+ <nd ref='-91525' />
+ <nd ref='-91527' />
+ <nd ref='-91529' />
+ <nd ref='-91531' />
+ <nd ref='-91533' />
+ <nd ref='-91535' />
+ <nd ref='-91537' />
+ <nd ref='-91539' />
+ <nd ref='-91541' />
+ <nd ref='-91543' />
+ <nd ref='-91547' />
+ <nd ref='-91549' />
+ <nd ref='-91551' />
+ <nd ref='-91553' />
+ <nd ref='-91555' />
+ <nd ref='-91557' />
+ <nd ref='-91559' />
+ <nd ref='-91561' />
+ <nd ref='-91563' />
+ <nd ref='-91565' />
+ <nd ref='-91567' />
+ <nd ref='-91569' />
+ <nd ref='-91571' />
+ <nd ref='-91575' />
+ <nd ref='-91577' />
+ <nd ref='-91579' />
+ <nd ref='-91581' />
+ <nd ref='-91585' />
+ <nd ref='-91587' />
+ <nd ref='-91589' />
+ <nd ref='-91591' />
+ <nd ref='-91593' />
+ <nd ref='-91595' />
+ <nd ref='-91597' />
+ <nd ref='-91599' />
+ <nd ref='-91601' />
+ <nd ref='-91603' />
+ <nd ref='-91605' />
+ <nd ref='-91607' />
+ <nd ref='-91609' />
+ <nd ref='-91611' />
+ <nd ref='-91613' />
+ <nd ref='-91615' />
+ <nd ref='-91617' />
+ <nd ref='-91619' />
+ <nd ref='-91621' />
+ <nd ref='-91623' />
+ <nd ref='-91625' />
+ <nd ref='-91627' />
+ <nd ref='-91629' />
+ <nd ref='-91631' />
+ <nd ref='-91692' />
+ <nd ref='-91694' />
+ <nd ref='-91696' />
+ <nd ref='-91704' />
+ <nd ref='-91708' />
+ <nd ref='-91710' />
+ <tag k='ISO3166-2' v='IN-MH' />
+ <tag k='name:en' v='Maharashtra' />
+ </way>
+ <way id='-93207'>
+ <nd ref='-93205' />
+ <nd ref='-93206' />
+ <nd ref='-11796' />
+ <nd ref='-11794' />
+ <nd ref='-93205' />
+ <tag k='ISO3166-2' v='IN-LD' />
+ <tag k='name:en' v='Lakshadweep' />
+ </way>
+ <way id='-93226'>
+ <nd ref='-12116' />
+ <nd ref='-93225' />
+ <nd ref='-11990' />
+ <nd ref='-11988' />
+ <nd ref='-12120' />
+ <nd ref='-12118' />
+ <nd ref='-12116' />
+ <tag k='ISO3166-2' v='IN-AN' />
+ <tag k='name:en' v='Andaman and Nicobar Islands' />
+ </way>
+ <way id='-93267'>
+ <nd ref='-91733' />
+ <nd ref='-93266' />
+ <nd ref='-93268' />
+ <nd ref='-93270' />
+ <nd ref='-93272' />
+ <nd ref='-93274' />
+ <nd ref='-93276' />
+ <nd ref='-93278' />
+ <nd ref='-93280' />
+ <nd ref='-93282' />
+ <nd ref='-93284' />
+ <nd ref='-93286' />
+ <nd ref='-93288' />
+ <nd ref='-93290' />
+ <nd ref='-93292' />
+ <nd ref='-93294' />
+ <nd ref='-93296' />
+ <nd ref='-93298' />
+ <nd ref='-93300' />
+ <nd ref='-93302' />
+ <nd ref='-93304' />
+ <nd ref='-93306' />
+ <nd ref='-93308' />
+ <nd ref='-93310' />
+ <nd ref='-93312' />
+ <nd ref='-93314' />
+ <nd ref='-93316' />
+ <nd ref='-93318' />
+ <nd ref='-93320' />
+ <nd ref='-93322' />
+ <nd ref='-93324' />
+ <nd ref='-93326' />
+ <nd ref='-93328' />
+ <nd ref='-93330' />
+ <nd ref='-93332' />
+ <nd ref='-93334' />
+ <nd ref='-93336' />
+ <nd ref='-93338' />
+ <nd ref='-93340' />
+ <nd ref='-93342' />
+ <nd ref='-93344' />
+ <nd ref='-93346' />
+ <nd ref='-93348' />
+ <nd ref='-93350' />
+ <nd ref='-93352' />
+ <nd ref='-93354' />
+ <nd ref='-93356' />
+ <nd ref='-93358' />
+ <nd ref='-93360' />
+ <nd ref='-93362' />
+ <nd ref='-93364' />
+ <nd ref='-93366' />
+ <nd ref='-93368' />
+ <nd ref='-93370' />
+ <nd ref='-93372' />
+ <nd ref='-93374' />
+ <nd ref='-93376' />
+ <nd ref='-93378' />
+ <nd ref='-93380' />
+ <nd ref='-93382' />
+ <nd ref='-93384' />
+ <nd ref='-93386' />
+ <nd ref='-93388' />
+ <nd ref='-93390' />
+ <nd ref='-93392' />
+ <nd ref='-93394' />
+ <nd ref='-93396' />
+ <nd ref='-93398' />
+ <nd ref='-93400' />
+ <nd ref='-93402' />
+ <nd ref='-93404' />
+ <nd ref='-93406' />
+ <nd ref='-93408' />
+ <nd ref='-93410' />
+ <nd ref='-93412' />
+ <nd ref='-93414' />
+ <nd ref='-93416' />
+ <nd ref='-93418' />
+ <nd ref='-93420' />
+ <nd ref='-93422' />
+ <nd ref='-93424' />
+ <nd ref='-93426' />
+ <nd ref='-93428' />
+ <nd ref='-93015' />
+ <nd ref='-93017' />
+ <nd ref='-93019' />
+ <nd ref='-93021' />
+ <nd ref='-93023' />
+ <nd ref='-93025' />
+ <nd ref='-93027' />
+ <nd ref='-93029' />
+ <nd ref='-93031' />
+ <nd ref='-93033' />
+ <nd ref='-93035' />
+ <nd ref='-93037' />
+ <nd ref='-93039' />
+ <nd ref='-93041' />
+ <nd ref='-93043' />
+ <nd ref='-91438' />
+ <nd ref='-91725' />
+ <nd ref='-91727' />
+ <nd ref='-91731' />
+ <nd ref='-91733' />
+ <tag k='ISO3166-2' v='IN-CT' />
+ <tag k='name:en' v='Chhattisgarh' />
+ </way>
+ <way id='-93662'>
+ <nd ref='-91924' />
+ <nd ref='-93661' />
+ <nd ref='-93663' />
+ <nd ref='-93665' />
+ <nd ref='-93667' />
+ <nd ref='-93669' />
+ <nd ref='-93671' />
+ <nd ref='-93673' />
+ <nd ref='-93675' />
+ <nd ref='-93677' />
+ <nd ref='-93679' />
+ <nd ref='-93681' />
+ <nd ref='-93683' />
+ <nd ref='-93695' />
+ <nd ref='-93697' />
+ <nd ref='-93699' />
+ <nd ref='-93701' />
+ <nd ref='-93703' />
+ <nd ref='-93705' />
+ <nd ref='-93707' />
+ <nd ref='-93342' />
+ <nd ref='-93340' />
+ <nd ref='-93338' />
+ <nd ref='-93336' />
+ <nd ref='-93334' />
+ <nd ref='-93332' />
+ <nd ref='-93330' />
+ <nd ref='-93328' />
+ <nd ref='-93326' />
+ <nd ref='-93324' />
+ <nd ref='-93322' />
+ <nd ref='-93320' />
+ <nd ref='-93318' />
+ <nd ref='-93316' />
+ <nd ref='-93314' />
+ <nd ref='-93312' />
+ <nd ref='-93310' />
+ <nd ref='-93308' />
+ <nd ref='-93306' />
+ <nd ref='-93304' />
+ <nd ref='-93302' />
+ <nd ref='-93300' />
+ <nd ref='-93298' />
+ <nd ref='-93296' />
+ <nd ref='-93294' />
+ <nd ref='-93292' />
+ <nd ref='-93290' />
+ <nd ref='-93288' />
+ <nd ref='-93286' />
+ <nd ref='-93284' />
+ <nd ref='-93282' />
+ <nd ref='-93280' />
+ <nd ref='-93278' />
+ <nd ref='-93276' />
+ <nd ref='-93274' />
+ <nd ref='-93272' />
+ <nd ref='-93270' />
+ <nd ref='-93268' />
+ <nd ref='-93266' />
+ <nd ref='-91733' />
+ <nd ref='-91735' />
+ <nd ref='-91878' />
+ <nd ref='-91880' />
+ <nd ref='-91882' />
+ <nd ref='-91884' />
+ <nd ref='-91886' />
+ <nd ref='-91888' />
+ <nd ref='-91890' />
+ <nd ref='-91892' />
+ <nd ref='-91894' />
+ <nd ref='-91896' />
+ <nd ref='-91898' />
+ <nd ref='-91900' />
+ <nd ref='-91902' />
+ <nd ref='-91904' />
+ <nd ref='-91906' />
+ <nd ref='-91908' />
+ <nd ref='-91910' />
+ <nd ref='-91912' />
+ <nd ref='-91914' />
+ <nd ref='-91916' />
+ <nd ref='-91918' />
+ <nd ref='-91920' />
+ <nd ref='-91922' />
+ <nd ref='-91924' />
+ <tag k='ISO3166-2' v='IN-OR' />
+ <tag k='name:en' v='Odisha' />
+ </way>
+ <way id='-93978'>
+ <nd ref='-93661' />
+ <nd ref='-9310' />
+ <nd ref='-7048' />
+ <nd ref='-9308' />
+ <nd ref='-19460' />
+ <nd ref='-27452' />
+ <nd ref='-27450' />
+ <nd ref='-7050' />
+ <nd ref='-7052' />
+ <nd ref='-19468' />
+ <nd ref='-27448' />
+ <nd ref='-19466' />
+ <nd ref='-19462' />
+ <nd ref='-19464' />
+ <nd ref='-27446' />
+ <nd ref='-7054' />
+ <nd ref='-19470' />
+ <nd ref='-7056' />
+ <nd ref='-19472' />
+ <nd ref='-19480' />
+ <nd ref='-19476' />
+ <nd ref='-19478' />
+ <nd ref='-19474' />
+ <nd ref='-7058' />
+ <nd ref='-7060' />
+ <nd ref='-7062' />
+ <nd ref='-19488' />
+ <nd ref='-19486' />
+ <nd ref='-19490' />
+ <nd ref='-19492' />
+ <nd ref='-19494' />
+ <nd ref='-19496' />
+ <nd ref='-19482' />
+ <nd ref='-19484' />
+ <nd ref='-19498' />
+ <nd ref='-19500' />
+ <nd ref='-27444' />
+ <nd ref='-19502' />
+ <nd ref='-19504' />
+ <nd ref='-19506' />
+ <nd ref='-19508' />
+ <nd ref='-19510' />
+ <nd ref='-7064' />
+ <nd ref='-7066' />
+ <nd ref='-7068' />
+ <nd ref='-7070' />
+ <nd ref='-27442' />
+ <nd ref='-7072' />
+ <nd ref='-7074' />
+ <nd ref='-19524' />
+ <nd ref='-19522' />
+ <nd ref='-19520' />
+ <nd ref='-19518' />
+ <nd ref='-19516' />
+ <nd ref='-19514' />
+ <nd ref='-19512' />
+ <nd ref='-19526' />
+ <nd ref='-27440' />
+ <nd ref='-19528' />
+ <nd ref='-19530' />
+ <nd ref='-19540' />
+ <nd ref='-19542' />
+ <nd ref='-19532' />
+ <nd ref='-19534' />
+ <nd ref='-27438' />
+ <nd ref='-19536' />
+ <nd ref='-19538' />
+ <nd ref='-7018' />
+ <nd ref='-19544' />
+ <nd ref='-27436' />
+ <nd ref='-19546' />
+ <nd ref='-19548' />
+ <nd ref='-27434' />
+ <nd ref='-19550' />
+ <nd ref='-94051' />
+ <nd ref='-94053' />
+ <nd ref='-94055' />
+ <nd ref='-94057' />
+ <nd ref='-27468' />
+ <nd ref='-27472' />
+ <nd ref='-27464' />
+ <nd ref='-27466' />
+ <nd ref='-2152' />
+ <nd ref='-27470' />
+ <nd ref='-2154' />
+ <nd ref='-2150' />
+ <nd ref='-27474' />
+ <nd ref='-27476' />
+ <nd ref='-2160' />
+ <nd ref='-2158' />
+ <nd ref='-2156' />
+ <nd ref='-94074' />
+ <nd ref='-94076' />
+ <nd ref='-94078' />
+ <nd ref='-94080' />
+ <nd ref='-94082' />
+ <nd ref='-94084' />
+ <nd ref='-94086' />
+ <nd ref='-94088' />
+ <nd ref='-94090' />
+ <nd ref='-94092' />
+ <nd ref='-1798' />
+ <nd ref='-1792' />
+ <nd ref='-27478' />
+ <nd ref='-27480' />
+ <nd ref='-1794' />
+ <nd ref='-27484' />
+ <nd ref='-27482' />
+ <nd ref='-27486' />
+ <nd ref='-94104' />
+ <nd ref='-94106' />
+ <nd ref='-94108' />
+ <nd ref='-94110' />
+ <nd ref='-94112' />
+ <nd ref='-94114' />
+ <nd ref='-94116' />
+ <nd ref='-94118' />
+ <nd ref='-94120' />
+ <nd ref='-94122' />
+ <nd ref='-94124' />
+ <nd ref='-94126' />
+ <nd ref='-94128' />
+ <nd ref='-94130' />
+ <nd ref='-94132' />
+ <nd ref='-94134' />
+ <nd ref='-94136' />
+ <nd ref='-94138' />
+ <nd ref='-94140' />
+ <nd ref='-94142' />
+ <nd ref='-94144' />
+ <nd ref='-94146' />
+ <nd ref='-94148' />
+ <nd ref='-94150' />
+ <nd ref='-94152' />
+ <nd ref='-94154' />
+ <nd ref='-94156' />
+ <nd ref='-94160' />
+ <nd ref='-94162' />
+ <nd ref='-94164' />
+ <nd ref='-94166' />
+ <nd ref='-94168' />
+ <nd ref='-94170' />
+ <nd ref='-94172' />
+ <nd ref='-94176' />
+ <nd ref='-94178' />
+ <nd ref='-94180' />
+ <nd ref='-94182' />
+ <nd ref='-94184' />
+ <nd ref='-94188' />
+ <nd ref='-94190' />
+ <nd ref='-94192' />
+ <nd ref='-94194' />
+ <nd ref='-94196' />
+ <nd ref='-94198' />
+ <nd ref='-94200' />
+ <nd ref='-94202' />
+ <nd ref='-94204' />
+ <nd ref='-94206' />
+ <nd ref='-94208' />
+ <nd ref='-94210' />
+ <nd ref='-94212' />
+ <nd ref='-94216' />
+ <nd ref='-94222' />
+ <nd ref='-94230' />
+ <nd ref='-93675' />
+ <nd ref='-93673' />
+ <nd ref='-93671' />
+ <nd ref='-93669' />
+ <nd ref='-93667' />
+ <nd ref='-93665' />
+ <nd ref='-93663' />
+ <nd ref='-93661' />
+ <tag k='ISO3166-2' v='IN-WB' />
+ <tag k='name:en' v='West Bengal' />
+ </way>
+ <way id='-94350'>
+ <nd ref='-92828' />
+ <nd ref='-94090' />
+ <nd ref='-94088' />
+ <nd ref='-94086' />
+ <nd ref='-94084' />
+ <nd ref='-94082' />
+ <nd ref='-94080' />
+ <nd ref='-94078' />
+ <nd ref='-94076' />
+ <nd ref='-94074' />
+ <nd ref='-2156' />
+ <nd ref='-7334' />
+ <nd ref='-27540' />
+ <nd ref='-21764' />
+ <nd ref='-21766' />
+ <nd ref='-21760' />
+ <nd ref='-21758' />
+ <nd ref='-21768' />
+ <nd ref='-21762' />
+ <nd ref='-7812' />
+ <nd ref='-10760' />
+ <nd ref='-1790' />
+ <nd ref='-1784' />
+ <nd ref='-1788' />
+ <nd ref='-1786' />
+ <nd ref='-92828' />
+ <tag k='ISO3166-2' v='IN-SK' />
+ <tag k='name:en' v='Sikkim' />
+ </way>
+ <way id='-94589'>
+ <nd ref='-93368' />
+ <nd ref='-94588' />
+ <nd ref='-94590' />
+ <nd ref='-94592' />
+ <nd ref='-94594' />
+ <nd ref='-94596' />
+ <nd ref='-94598' />
+ <nd ref='-94600' />
+ <nd ref='-94602' />
+ <nd ref='-94604' />
+ <nd ref='-94612' />
+ <nd ref='-94618' />
+ <nd ref='-94620' />
+ <nd ref='-94622' />
+ <nd ref='-94624' />
+ <nd ref='-94626' />
+ <nd ref='-94628' />
+ <nd ref='-94630' />
+ <nd ref='-94632' />
+ <nd ref='-94634' />
+ <nd ref='-94636' />
+ <nd ref='-94638' />
+ <nd ref='-94640' />
+ <nd ref='-94642' />
+ <nd ref='-94644' />
+ <nd ref='-94646' />
+ <nd ref='-94648' />
+ <nd ref='-94650' />
+ <nd ref='-94652' />
+ <nd ref='-94654' />
+ <nd ref='-94656' />
+ <nd ref='-94658' />
+ <nd ref='-94660' />
+ <nd ref='-94662' />
+ <nd ref='-94664' />
+ <nd ref='-94666' />
+ <nd ref='-94668' />
+ <nd ref='-94670' />
+ <nd ref='-94672' />
+ <nd ref='-94674' />
+ <nd ref='-94678' />
+ <nd ref='-94686' />
+ <nd ref='-94688' />
+ <nd ref='-1782' />
+ <nd ref='-1650' />
+ <nd ref='-1652' />
+ <nd ref='-1648' />
+ <nd ref='-1642' />
+ <nd ref='-1644' />
+ <nd ref='-1646' />
+ <nd ref='-1654' />
+ <nd ref='-1656' />
+ <nd ref='-1658' />
+ <nd ref='-1660' />
+ <nd ref='-1662' />
+ <nd ref='-1668' />
+ <nd ref='-1666' />
+ <nd ref='-1664' />
+ <nd ref='-1670' />
+ <nd ref='-1672' />
+ <nd ref='-1638' />
+ <nd ref='-1636' />
+ <nd ref='-1632' />
+ <nd ref='-1634' />
+ <nd ref='-1640' />
+ <nd ref='-27530' />
+ <nd ref='-1628' />
+ <nd ref='-1630' />
+ <nd ref='-1624' />
+ <nd ref='-1626' />
+ <nd ref='-1588' />
+ <nd ref='-1584' />
+ <nd ref='-1586' />
+ <nd ref='-10762' />
+ <nd ref='-92782' />
+ <nd ref='-92780' />
+ <nd ref='-92778' />
+ <nd ref='-92776' />
+ <nd ref='-92774' />
+ <nd ref='-92772' />
+ <nd ref='-92770' />
+ <nd ref='-92768' />
+ <nd ref='-92766' />
+ <nd ref='-92764' />
+ <nd ref='-92762' />
+ <nd ref='-92760' />
+ <nd ref='-92758' />
+ <nd ref='-92756' />
+ <nd ref='-92754' />
+ <nd ref='-92752' />
+ <nd ref='-92750' />
+ <nd ref='-92748' />
+ <nd ref='-92746' />
+ <nd ref='-94746' />
+ <nd ref='-94748' />
+ <nd ref='-94750' />
+ <nd ref='-94752' />
+ <nd ref='-94754' />
+ <nd ref='-94756' />
+ <nd ref='-94758' />
+ <nd ref='-94760' />
+ <nd ref='-94853' />
+ <nd ref='-94762' />
+ <nd ref='-94764' />
+ <nd ref='-94766' />
+ <nd ref='-94881' />
+ <nd ref='-94768' />
+ <nd ref='-94913' />
+ <nd ref='-94957' />
+ <nd ref='-94933' />
+ <nd ref='-94770' />
+ <nd ref='-94772' />
+ <nd ref='-94774' />
+ <nd ref='-94977' />
+ <nd ref='-94987' />
+ <nd ref='-94776' />
+ <nd ref='-94778' />
+ <nd ref='-94780' />
+ <nd ref='-95002' />
+ <nd ref='-94782' />
+ <nd ref='-94784' />
+ <nd ref='-94786' />
+ <nd ref='-95046' />
+ <nd ref='-94788' />
+ <nd ref='-94790' />
+ <nd ref='-94792' />
+ <nd ref='-94794' />
+ <nd ref='-94796' />
+ <nd ref='-94798' />
+ <nd ref='-94800' />
+ <nd ref='-95078' />
+ <nd ref='-94802' />
+ <nd ref='-94804' />
+ <nd ref='-95119' />
+ <nd ref='-94806' />
+ <nd ref='-94808' />
+ <nd ref='-94810' />
+ <nd ref='-94812' />
+ <nd ref='-94814' />
+ <nd ref='-94816' />
+ <nd ref='-94835' />
+ <nd ref='-94818' />
+ <nd ref='-95144' />
+ <nd ref='-94820' />
+ <nd ref='-95147' />
+ <nd ref='-95149' />
+ <nd ref='-95151' />
+ <nd ref='-95153' />
+ <nd ref='-95155' />
+ <nd ref='-95157' />
+ <nd ref='-95159' />
+ <nd ref='-95161' />
+ <nd ref='-95163' />
+ <nd ref='-95165' />
+ <nd ref='-95167' />
+ <nd ref='-95169' />
+ <nd ref='-95171' />
+ <nd ref='-95179' />
+ <nd ref='-95183' />
+ <nd ref='-95185' />
+ <nd ref='-95187' />
+ <nd ref='-95189' />
+ <nd ref='-95191' />
+ <nd ref='-95193' />
+ <nd ref='-95195' />
+ <nd ref='-95197' />
+ <nd ref='-95199' />
+ <nd ref='-95201' />
+ <nd ref='-95203' />
+ <nd ref='-95205' />
+ <nd ref='-95207' />
+ <nd ref='-95209' />
+ <nd ref='-95211' />
+ <nd ref='-95213' />
+ <nd ref='-95215' />
+ <nd ref='-95217' />
+ <nd ref='-95219' />
+ <nd ref='-95221' />
+ <nd ref='-95223' />
+ <nd ref='-95225' />
+ <nd ref='-95227' />
+ <nd ref='-95229' />
+ <nd ref='-95231' />
+ <nd ref='-95233' />
+ <nd ref='-95235' />
+ <nd ref='-95237' />
+ <nd ref='-95239' />
+ <nd ref='-95241' />
+ <nd ref='-95243' />
+ <nd ref='-95245' />
+ <nd ref='-95247' />
+ <nd ref='-95249' />
+ <nd ref='-95251' />
+ <nd ref='-95253' />
+ <nd ref='-95255' />
+ <nd ref='-95257' />
+ <nd ref='-95259' />
+ <nd ref='-95261' />
+ <nd ref='-95263' />
+ <nd ref='-95265' />
+ <nd ref='-95267' />
+ <nd ref='-95269' />
+ <nd ref='-95271' />
+ <nd ref='-95273' />
+ <nd ref='-95275' />
+ <nd ref='-95277' />
+ <nd ref='-95279' />
+ <nd ref='-95281' />
+ <nd ref='-95283' />
+ <nd ref='-95285' />
+ <nd ref='-95287' />
+ <nd ref='-95289' />
+ <nd ref='-95291' />
+ <nd ref='-95293' />
+ <nd ref='-95295' />
+ <nd ref='-95297' />
+ <nd ref='-95299' />
+ <nd ref='-95301' />
+ <nd ref='-95303' />
+ <nd ref='-95305' />
+ <nd ref='-95307' />
+ <nd ref='-95309' />
+ <nd ref='-95311' />
+ <nd ref='-95313' />
+ <nd ref='-95315' />
+ <nd ref='-95317' />
+ <nd ref='-95319' />
+ <nd ref='-95321' />
+ <nd ref='-95323' />
+ <nd ref='-95325' />
+ <nd ref='-95327' />
+ <nd ref='-95329' />
+ <nd ref='-95331' />
+ <nd ref='-95333' />
+ <nd ref='-95335' />
+ <nd ref='-95337' />
+ <nd ref='-95339' />
+ <nd ref='-95341' />
+ <nd ref='-95343' />
+ <nd ref='-95345' />
+ <nd ref='-95347' />
+ <nd ref='-95349' />
+ <nd ref='-95351' />
+ <nd ref='-95353' />
+ <nd ref='-95355' />
+ <nd ref='-95357' />
+ <nd ref='-95359' />
+ <nd ref='-95361' />
+ <nd ref='-95363' />
+ <nd ref='-93374' />
+ <nd ref='-93372' />
+ <nd ref='-93370' />
+ <nd ref='-93368' />
+ <tag k='ISO3166-2' v='IN-UP' />
+ <tag k='name:en' v='Uttar Pradesh' />
+ </way>
+ <way id='-95719'>
+ <nd ref='-94596' />
+ <nd ref='-95718' />
+ <nd ref='-95720' />
+ <nd ref='-95722' />
+ <nd ref='-95730' />
+ <nd ref='-95732' />
+ <nd ref='-95738' />
+ <nd ref='-95744' />
+ <nd ref='-95746' />
+ <nd ref='-95748' />
+ <nd ref='-95750' />
+ <nd ref='-95752' />
+ <nd ref='-95754' />
+ <nd ref='-95756' />
+ <nd ref='-95758' />
+ <nd ref='-95760' />
+ <nd ref='-95770' />
+ <nd ref='-95772' />
+ <nd ref='-95774' />
+ <nd ref='-95776' />
+ <nd ref='-95778' />
+ <nd ref='-95780' />
+ <nd ref='-95782' />
+ <nd ref='-95784' />
+ <nd ref='-95786' />
+ <nd ref='-95788' />
+ <nd ref='-95790' />
+ <nd ref='-95792' />
+ <nd ref='-94140' />
+ <nd ref='-94142' />
+ <nd ref='-94144' />
+ <nd ref='-94146' />
+ <nd ref='-94148' />
+ <nd ref='-94150' />
+ <nd ref='-94152' />
+ <nd ref='-94154' />
+ <nd ref='-94156' />
+ <nd ref='-94160' />
+ <nd ref='-94162' />
+ <nd ref='-94164' />
+ <nd ref='-94166' />
+ <nd ref='-94168' />
+ <nd ref='-94170' />
+ <nd ref='-94172' />
+ <nd ref='-94176' />
+ <nd ref='-94178' />
+ <nd ref='-94180' />
+ <nd ref='-94182' />
+ <nd ref='-94184' />
+ <nd ref='-94188' />
+ <nd ref='-94190' />
+ <nd ref='-94192' />
+ <nd ref='-94194' />
+ <nd ref='-94196' />
+ <nd ref='-94198' />
+ <nd ref='-94200' />
+ <nd ref='-94202' />
+ <nd ref='-94204' />
+ <nd ref='-94206' />
+ <nd ref='-94208' />
+ <nd ref='-94210' />
+ <nd ref='-94212' />
+ <nd ref='-94216' />
+ <nd ref='-94222' />
+ <nd ref='-94230' />
+ <nd ref='-93675' />
+ <nd ref='-93677' />
+ <nd ref='-93679' />
+ <nd ref='-93681' />
+ <nd ref='-93683' />
+ <nd ref='-93695' />
+ <nd ref='-93697' />
+ <nd ref='-93699' />
+ <nd ref='-93701' />
+ <nd ref='-93703' />
+ <nd ref='-93705' />
+ <nd ref='-93707' />
+ <nd ref='-93342' />
+ <nd ref='-93344' />
+ <nd ref='-93346' />
+ <nd ref='-93348' />
+ <nd ref='-93350' />
+ <nd ref='-93352' />
+ <nd ref='-93354' />
+ <nd ref='-93356' />
+ <nd ref='-93358' />
+ <nd ref='-93360' />
+ <nd ref='-93362' />
+ <nd ref='-93364' />
+ <nd ref='-93366' />
+ <nd ref='-93368' />
+ <nd ref='-94588' />
+ <nd ref='-94590' />
+ <nd ref='-94592' />
+ <nd ref='-94594' />
+ <nd ref='-94596' />
+ <tag k='ISO3166-2' v='IN-JH' />
+ <tag k='name:en' v='Jharkhand' />
+ </way>
+ <way id='-95891'>
+ <nd ref='-94596' />
+ <nd ref='-95718' />
+ <nd ref='-95720' />
+ <nd ref='-95722' />
+ <nd ref='-95730' />
+ <nd ref='-95732' />
+ <nd ref='-95738' />
+ <nd ref='-95744' />
+ <nd ref='-95746' />
+ <nd ref='-95748' />
+ <nd ref='-95750' />
+ <nd ref='-95752' />
+ <nd ref='-95754' />
+ <nd ref='-95756' />
+ <nd ref='-95758' />
+ <nd ref='-95760' />
+ <nd ref='-95770' />
+ <nd ref='-95772' />
+ <nd ref='-95774' />
+ <nd ref='-95776' />
+ <nd ref='-95778' />
+ <nd ref='-95780' />
+ <nd ref='-95782' />
+ <nd ref='-95784' />
+ <nd ref='-95786' />
+ <nd ref='-95788' />
+ <nd ref='-95790' />
+ <nd ref='-95792' />
+ <nd ref='-94140' />
+ <nd ref='-94138' />
+ <nd ref='-94136' />
+ <nd ref='-94134' />
+ <nd ref='-94132' />
+ <nd ref='-94130' />
+ <nd ref='-94128' />
+ <nd ref='-94126' />
+ <nd ref='-94124' />
+ <nd ref='-94122' />
+ <nd ref='-94120' />
+ <nd ref='-94118' />
+ <nd ref='-94116' />
+ <nd ref='-94114' />
+ <nd ref='-94112' />
+ <nd ref='-94110' />
+ <nd ref='-94108' />
+ <nd ref='-94106' />
+ <nd ref='-94104' />
+ <nd ref='-27486' />
+ <nd ref='-1796' />
+ <nd ref='-9280' />
+ <nd ref='-27488' />
+ <nd ref='-1760' />
+ <nd ref='-1752' />
+ <nd ref='-1754' />
+ <nd ref='-1756' />
+ <nd ref='-1758' />
+ <nd ref='-1750' />
+ <nd ref='-1762' />
+ <nd ref='-27490' />
+ <nd ref='-1748' />
+ <nd ref='-1764' />
+ <nd ref='-1766' />
+ <nd ref='-1776' />
+ <nd ref='-1768' />
+ <nd ref='-1770' />
+ <nd ref='-27492' />
+ <nd ref='-27494' />
+ <nd ref='-1772' />
+ <nd ref='-1774' />
+ <nd ref='-1778' />
+ <nd ref='-1732' />
+ <nd ref='-1734' />
+ <nd ref='-1736' />
+ <nd ref='-27496' />
+ <nd ref='-1728' />
+ <nd ref='-1724' />
+ <nd ref='-1740' />
+ <nd ref='-27498' />
+ <nd ref='-27500' />
+ <nd ref='-27502' />
+ <nd ref='-27504' />
+ <nd ref='-1738' />
+ <nd ref='-27506' />
+ <nd ref='-27508' />
+ <nd ref='-1742' />
+ <nd ref='-1744' />
+ <nd ref='-27510' />
+ <nd ref='-1746' />
+ <nd ref='-1718' />
+ <nd ref='-1716' />
+ <nd ref='-27512' />
+ <nd ref='-1714' />
+ <nd ref='-1722' />
+ <nd ref='-1720' />
+ <nd ref='-27514' />
+ <nd ref='-1780' />
+ <nd ref='-27520' />
+ <nd ref='-27518' />
+ <nd ref='-27516' />
+ <nd ref='-27522' />
+ <nd ref='-1708' />
+ <nd ref='-1710' />
+ <nd ref='-1704' />
+ <nd ref='-1706' />
+ <nd ref='-27524' />
+ <nd ref='-1702' />
+ <nd ref='-1700' />
+ <nd ref='-27526' />
+ <nd ref='-1692' />
+ <nd ref='-1694' />
+ <nd ref='-1698' />
+ <nd ref='-1696' />
+ <nd ref='-27528' />
+ <nd ref='-1712' />
+ <nd ref='-1688' />
+ <nd ref='-1690' />
+ <nd ref='-1686' />
+ <nd ref='-1676' />
+ <nd ref='-1674' />
+ <nd ref='-1678' />
+ <nd ref='-1680' />
+ <nd ref='-1684' />
+ <nd ref='-1682' />
+ <nd ref='-1782' />
+ <nd ref='-94688' />
+ <nd ref='-94686' />
+ <nd ref='-94678' />
+ <nd ref='-94674' />
+ <nd ref='-94672' />
+ <nd ref='-94670' />
+ <nd ref='-94668' />
+ <nd ref='-94666' />
+ <nd ref='-94664' />
+ <nd ref='-94662' />
+ <nd ref='-94660' />
+ <nd ref='-94658' />
+ <nd ref='-94656' />
+ <nd ref='-94654' />
+ <nd ref='-94652' />
+ <nd ref='-94650' />
+ <nd ref='-94648' />
+ <nd ref='-94646' />
+ <nd ref='-94644' />
+ <nd ref='-94642' />
+ <nd ref='-94640' />
+ <nd ref='-94638' />
+ <nd ref='-94636' />
+ <nd ref='-94634' />
+ <nd ref='-94632' />
+ <nd ref='-94630' />
+ <nd ref='-94628' />
+ <nd ref='-94626' />
+ <nd ref='-94624' />
+ <nd ref='-94622' />
+ <nd ref='-94620' />
+ <nd ref='-94618' />
+ <nd ref='-94612' />
+ <nd ref='-94604' />
+ <nd ref='-94602' />
+ <nd ref='-94600' />
+ <nd ref='-94598' />
+ <nd ref='-94596' />
+ <tag k='ISO3166-2' v='IN-BR' />
+ <tag k='name:en' v='Bihar' />
+ </way>
+ <way id='-96082'>
+ <nd ref='-96092' />
+ <nd ref='-96091' />
+ <nd ref='-96096' />
+ <nd ref='-96080' />
+ <nd ref='-96081' />
+ <nd ref='-96083' />
+ <nd ref='-96344' />
+ <nd ref='-96092' />
+ <tag k='ISO3166-2' v='IN-DD' />
+ <tag k='name:en' v='Daman & Diu' />
+ </way>
+ <way id='-96158'>
+ <nd ref='-96092' />
+ <nd ref='-96157' />
+ <nd ref='-9316' />
+ <nd ref='-9318' />
+ <nd ref='-9320' />
+ <nd ref='-9322' />
+ <nd ref='-22248' />
+ <nd ref='-22250' />
+ <nd ref='-22252' />
+ <nd ref='-22254' />
+ <nd ref='-22256' />
+ <nd ref='-22258' />
+ <nd ref='-22260' />
+ <nd ref='-9324' />
+ <nd ref='-9326' />
+ <nd ref='-9328' />
+ <nd ref='-22262' />
+ <nd ref='-22264' />
+ <nd ref='-22268' />
+ <nd ref='-22266' />
+ <nd ref='-22270' />
+ <nd ref='-22272' />
+ <nd ref='-22274' />
+ <nd ref='-22282' />
+ <nd ref='-22280' />
+ <nd ref='-22278' />
+ <nd ref='-22276' />
+ <nd ref='-96189' />
+ <nd ref='-96195' />
+ <nd ref='-96197' />
+ <nd ref='-96199' />
+ <nd ref='-96201' />
+ <nd ref='-96203' />
+ <nd ref='-96205' />
+ <nd ref='-96211' />
+ <nd ref='-96213' />
+ <nd ref='-96217' />
+ <nd ref='-96219' />
+ <nd ref='-96221' />
+ <nd ref='-96223' />
+ <nd ref='-96229' />
+ <nd ref='-96231' />
+ <nd ref='-96239' />
+ <nd ref='-96241' />
+ <nd ref='-96245' />
+ <nd ref='-96253' />
+ <nd ref='-96255' />
+ <nd ref='-96257' />
+ <nd ref='-96259' />
+ <nd ref='-96261' />
+ <nd ref='-96265' />
+ <nd ref='-96271' />
+ <nd ref='-96273' />
+ <nd ref='-96275' />
+ <nd ref='-96277' />
+ <nd ref='-92925' />
+ <nd ref='-92923' />
+ <nd ref='-92921' />
+ <nd ref='-92919' />
+ <nd ref='-92917' />
+ <nd ref='-92915' />
+ <nd ref='-92913' />
+ <nd ref='-92911' />
+ <nd ref='-92909' />
+ <nd ref='-92905' />
+ <nd ref='-92903' />
+ <nd ref='-92901' />
+ <nd ref='-92899' />
+ <nd ref='-92897' />
+ <nd ref='-92895' />
+ <nd ref='-92891' />
+ <nd ref='-92889' />
+ <nd ref='-92887' />
+ <nd ref='-92885' />
+ <nd ref='-92883' />
+ <nd ref='-92881' />
+ <nd ref='-92879' />
+ <nd ref='-92877' />
+ <nd ref='-92875' />
+ <nd ref='-92873' />
+ <nd ref='-92871' />
+ <nd ref='-92869' />
+ <nd ref='-92867' />
+ <nd ref='-92865' />
+ <nd ref='-92863' />
+ <nd ref='-96326' />
+ <nd ref='-96328' />
+ <nd ref='-96330' />
+ <nd ref='-96332' />
+ <nd ref='-96334' />
+ <nd ref='-96336' />
+ <nd ref='-96338' />
+ <nd ref='-92843' />
+ <nd ref='-92841' />
+ <nd ref='-92839' />
+ <nd ref='-92837' />
+ <nd ref='-96344' />
+ <nd ref='-96083' />
+ <nd ref='-96081' />
+ <nd ref='-96080' />
+ <nd ref='-96096' />
+ <nd ref='-96091' />
+ <nd ref='-96092' />
+ <tag k='ISO3166-2' v='IN-GJ' />
+ <tag k='name:en' v='Gujarat' />
+ </way>
+ <way id='-96365'>
+ <nd ref='-92861' />
+ <nd ref='-92859' />
+ <nd ref='-92843' />
+ <nd ref='-96338' />
+ <nd ref='-96336' />
+ <nd ref='-96334' />
+ <nd ref='-96332' />
+ <nd ref='-96330' />
+ <nd ref='-96328' />
+ <nd ref='-96326' />
+ <nd ref='-92863' />
+ <nd ref='-92861' />
+ <tag k='ISO3166-2' v='IN-DN' />
+ <tag k='name:en' v='Dadra & Nagar Haveli' />
+ </way>
+ <way id='-96389'>
+ <nd ref='-96255' />
+ <nd ref='-96388' />
+ <nd ref='-96390' />
+ <nd ref='-96392' />
+ <nd ref='-96394' />
+ <nd ref='-96396' />
+ <nd ref='-96398' />
+ <nd ref='-96400' />
+ <nd ref='-96402' />
+ <nd ref='-96404' />
+ <nd ref='-96406' />
+ <nd ref='-96408' />
+ <nd ref='-96410' />
+ <nd ref='-96412' />
+ <nd ref='-96414' />
+ <nd ref='-96416' />
+ <nd ref='-96418' />
+ <nd ref='-96420' />
+ <nd ref='-96424' />
+ <nd ref='-96426' />
+ <nd ref='-96428' />
+ <nd ref='-96430' />
+ <nd ref='-96432' />
+ <nd ref='-96434' />
+ <nd ref='-96436' />
+ <nd ref='-96438' />
+ <nd ref='-96440' />
+ <nd ref='-96442' />
+ <nd ref='-96444' />
+ <nd ref='-96450' />
+ <nd ref='-96452' />
+ <nd ref='-96460' />
+ <nd ref='-96462' />
+ <nd ref='-96464' />
+ <nd ref='-96466' />
+ <nd ref='-96468' />
+ <nd ref='-96470' />
+ <nd ref='-96472' />
+ <nd ref='-96474' />
+ <nd ref='-96476' />
+ <nd ref='-96478' />
+ <nd ref='-96480' />
+ <nd ref='-96482' />
+ <nd ref='-96484' />
+ <nd ref='-96490' />
+ <nd ref='-96494' />
+ <nd ref='-96500' />
+ <nd ref='-96504' />
+ <nd ref='-96506' />
+ <nd ref='-96508' />
+ <nd ref='-96510' />
+ <nd ref='-96512' />
+ <nd ref='-96516' />
+ <nd ref='-96518' />
+ <nd ref='-96520' />
+ <nd ref='-96532' />
+ <nd ref='-96534' />
+ <nd ref='-96536' />
+ <nd ref='-96538' />
+ <nd ref='-96540' />
+ <nd ref='-96542' />
+ <nd ref='-96544' />
+ <nd ref='-96546' />
+ <nd ref='-96548' />
+ <nd ref='-96550' />
+ <nd ref='-96552' />
+ <nd ref='-96554' />
+ <nd ref='-96556' />
+ <nd ref='-96558' />
+ <nd ref='-96560' />
+ <nd ref='-96562' />
+ <nd ref='-96564' />
+ <nd ref='-96566' />
+ <nd ref='-96568' />
+ <nd ref='-96570' />
+ <nd ref='-96572' />
+ <nd ref='-96574' />
+ <nd ref='-96576' />
+ <nd ref='-96578' />
+ <nd ref='-96580' />
+ <nd ref='-96582' />
+ <nd ref='-96584' />
+ <nd ref='-96586' />
+ <nd ref='-96588' />
+ <nd ref='-96590' />
+ <nd ref='-96592' />
+ <nd ref='-96594' />
+ <nd ref='-95205' />
+ <nd ref='-95207' />
+ <nd ref='-95209' />
+ <nd ref='-95211' />
+ <nd ref='-95213' />
+ <nd ref='-95215' />
+ <nd ref='-95217' />
+ <nd ref='-95219' />
+ <nd ref='-95221' />
+ <nd ref='-95223' />
+ <nd ref='-95225' />
+ <nd ref='-95227' />
+ <nd ref='-95229' />
+ <nd ref='-95231' />
+ <nd ref='-95233' />
+ <nd ref='-95235' />
+ <nd ref='-95237' />
+ <nd ref='-95239' />
+ <nd ref='-95241' />
+ <nd ref='-95243' />
+ <nd ref='-95245' />
+ <nd ref='-95247' />
+ <nd ref='-95249' />
+ <nd ref='-95251' />
+ <nd ref='-95253' />
+ <nd ref='-95255' />
+ <nd ref='-95257' />
+ <nd ref='-95259' />
+ <nd ref='-95261' />
+ <nd ref='-95263' />
+ <nd ref='-95265' />
+ <nd ref='-95267' />
+ <nd ref='-95269' />
+ <nd ref='-95271' />
+ <nd ref='-95273' />
+ <nd ref='-95275' />
+ <nd ref='-95277' />
+ <nd ref='-95279' />
+ <nd ref='-95281' />
+ <nd ref='-95283' />
+ <nd ref='-95285' />
+ <nd ref='-95287' />
+ <nd ref='-95289' />
+ <nd ref='-95291' />
+ <nd ref='-95293' />
+ <nd ref='-95295' />
+ <nd ref='-95297' />
+ <nd ref='-95299' />
+ <nd ref='-95301' />
+ <nd ref='-95303' />
+ <nd ref='-95305' />
+ <nd ref='-95307' />
+ <nd ref='-95309' />
+ <nd ref='-95311' />
+ <nd ref='-95313' />
+ <nd ref='-95315' />
+ <nd ref='-95317' />
+ <nd ref='-95319' />
+ <nd ref='-95321' />
+ <nd ref='-95323' />
+ <nd ref='-95325' />
+ <nd ref='-95327' />
+ <nd ref='-95329' />
+ <nd ref='-95331' />
+ <nd ref='-95333' />
+ <nd ref='-95335' />
+ <nd ref='-95337' />
+ <nd ref='-95339' />
+ <nd ref='-95341' />
+ <nd ref='-95343' />
+ <nd ref='-95345' />
+ <nd ref='-95347' />
+ <nd ref='-95349' />
+ <nd ref='-95351' />
+ <nd ref='-95353' />
+ <nd ref='-95355' />
+ <nd ref='-95357' />
+ <nd ref='-95359' />
+ <nd ref='-95361' />
+ <nd ref='-95363' />
+ <nd ref='-93374' />
+ <nd ref='-93376' />
+ <nd ref='-93378' />
+ <nd ref='-93380' />
+ <nd ref='-93382' />
+ <nd ref='-93384' />
+ <nd ref='-93386' />
+ <nd ref='-93388' />
+ <nd ref='-93390' />
+ <nd ref='-93392' />
+ <nd ref='-93394' />
+ <nd ref='-93396' />
+ <nd ref='-93398' />
+ <nd ref='-93400' />
+ <nd ref='-93402' />
+ <nd ref='-93404' />
+ <nd ref='-93406' />
+ <nd ref='-93408' />
+ <nd ref='-93410' />
+ <nd ref='-93412' />
+ <nd ref='-93414' />
+ <nd ref='-93416' />
+ <nd ref='-93418' />
+ <nd ref='-93420' />
+ <nd ref='-93422' />
+ <nd ref='-93424' />
+ <nd ref='-93426' />
+ <nd ref='-93428' />
+ <nd ref='-93015' />
+ <nd ref='-93013' />
+ <nd ref='-93011' />
+ <nd ref='-93009' />
+ <nd ref='-93007' />
+ <nd ref='-93005' />
+ <nd ref='-93003' />
+ <nd ref='-93001' />
+ <nd ref='-92999' />
+ <nd ref='-92997' />
+ <nd ref='-92995' />
+ <nd ref='-92993' />
+ <nd ref='-92991' />
+ <nd ref='-92989' />
+ <nd ref='-92987' />
+ <nd ref='-92985' />
+ <nd ref='-92983' />
+ <nd ref='-92975' />
+ <nd ref='-92973' />
+ <nd ref='-92971' />
+ <nd ref='-92969' />
+ <nd ref='-92967' />
+ <nd ref='-92965' />
+ <nd ref='-92963' />
+ <nd ref='-92961' />
+ <nd ref='-92959' />
+ <nd ref='-92957' />
+ <nd ref='-92955' />
+ <nd ref='-92953' />
+ <nd ref='-92951' />
+ <nd ref='-92949' />
+ <nd ref='-92943' />
+ <nd ref='-92941' />
+ <nd ref='-92939' />
+ <nd ref='-92937' />
+ <nd ref='-92933' />
+ <nd ref='-92931' />
+ <nd ref='-92929' />
+ <nd ref='-92927' />
+ <nd ref='-92925' />
+ <nd ref='-96277' />
+ <nd ref='-96275' />
+ <nd ref='-96273' />
+ <nd ref='-96271' />
+ <nd ref='-96265' />
+ <nd ref='-96261' />
+ <nd ref='-96259' />
+ <nd ref='-96257' />
+ <nd ref='-96255' />
+ <tag k='ISO3166-2' v='IN-MP' />
+ <tag k='name:en' v='Madhya Pradesh' />
+ </way>
+ <way id='-96806'>
+ <nd ref='-9372' />
+ <nd ref='-96805' />
+ <nd ref='-96807' />
+ <nd ref='-96809' />
+ <nd ref='-96811' />
+ <nd ref='-96813' />
+ <nd ref='-96815' />
+ <nd ref='-96817' />
+ <nd ref='-96819' />
+ <nd ref='-96821' />
+ <nd ref='-96823' />
+ <nd ref='-96825' />
+ <nd ref='-96833' />
+ <nd ref='-96839' />
+ <nd ref='-96841' />
+ <nd ref='-96845' />
+ <nd ref='-96847' />
+ <nd ref='-96849' />
+ <nd ref='-96853' />
+ <nd ref='-96855' />
+ <nd ref='-96857' />
+ <nd ref='-96859' />
+ <nd ref='-96861' />
+ <nd ref='-96863' />
+ <nd ref='-96865' />
+ <nd ref='-96873' />
+ <nd ref='-96875' />
+ <nd ref='-96877' />
+ <nd ref='-96881' />
+ <nd ref='-96887' />
+ <nd ref='-96889' />
+ <nd ref='-96891' />
+ <nd ref='-96895' />
+ <nd ref='-96897' />
+ <nd ref='-96899' />
+ <nd ref='-96901' />
+ <nd ref='-96903' />
+ <nd ref='-96905' />
+ <nd ref='-96907' />
+ <nd ref='-96909' />
+ <nd ref='-96911' />
+ <nd ref='-96913' />
+ <nd ref='-96915' />
+ <nd ref='-96925' />
+ <nd ref='-96927' />
+ <nd ref='-96929' />
+ <nd ref='-96931' />
+ <nd ref='-96933' />
+ <nd ref='-96935' />
+ <nd ref='-96937' />
+ <nd ref='-96941' />
+ <nd ref='-96943' />
+ <nd ref='-96945' />
+ <nd ref='-96947' />
+ <nd ref='-95179' />
+ <nd ref='-95183' />
+ <nd ref='-95185' />
+ <nd ref='-95187' />
+ <nd ref='-95189' />
+ <nd ref='-95191' />
+ <nd ref='-95193' />
+ <nd ref='-95195' />
+ <nd ref='-95197' />
+ <nd ref='-95199' />
+ <nd ref='-95201' />
+ <nd ref='-95203' />
+ <nd ref='-95205' />
+ <nd ref='-96594' />
+ <nd ref='-96592' />
+ <nd ref='-96590' />
+ <nd ref='-96588' />
+ <nd ref='-96586' />
+ <nd ref='-96584' />
+ <nd ref='-96582' />
+ <nd ref='-96580' />
+ <nd ref='-96578' />
+ <nd ref='-96576' />
+ <nd ref='-96574' />
+ <nd ref='-96572' />
+ <nd ref='-96570' />
+ <nd ref='-96568' />
+ <nd ref='-96566' />
+ <nd ref='-96564' />
+ <nd ref='-96562' />
+ <nd ref='-96560' />
+ <nd ref='-96558' />
+ <nd ref='-96556' />
+ <nd ref='-96554' />
+ <nd ref='-96552' />
+ <nd ref='-96550' />
+ <nd ref='-96548' />
+ <nd ref='-96546' />
+ <nd ref='-96544' />
+ <nd ref='-96542' />
+ <nd ref='-96540' />
+ <nd ref='-96538' />
+ <nd ref='-96536' />
+ <nd ref='-96534' />
+ <nd ref='-96532' />
+ <nd ref='-96520' />
+ <nd ref='-96518' />
+ <nd ref='-96516' />
+ <nd ref='-96512' />
+ <nd ref='-96510' />
+ <nd ref='-96508' />
+ <nd ref='-96506' />
+ <nd ref='-96504' />
+ <nd ref='-96500' />
+ <nd ref='-96494' />
+ <nd ref='-96490' />
+ <nd ref='-96484' />
+ <nd ref='-96482' />
+ <nd ref='-96480' />
+ <nd ref='-96478' />
+ <nd ref='-96476' />
+ <nd ref='-96474' />
+ <nd ref='-96472' />
+ <nd ref='-96470' />
+ <nd ref='-96468' />
+ <nd ref='-96466' />
+ <nd ref='-96464' />
+ <nd ref='-96462' />
+ <nd ref='-96460' />
+ <nd ref='-96452' />
+ <nd ref='-96450' />
+ <nd ref='-96444' />
+ <nd ref='-96442' />
+ <nd ref='-96440' />
+ <nd ref='-96438' />
+ <nd ref='-96436' />
+ <nd ref='-96434' />
+ <nd ref='-96432' />
+ <nd ref='-96430' />
+ <nd ref='-96428' />
+ <nd ref='-96426' />
+ <nd ref='-96424' />
+ <nd ref='-96420' />
+ <nd ref='-96418' />
+ <nd ref='-96416' />
+ <nd ref='-96414' />
+ <nd ref='-96412' />
+ <nd ref='-96410' />
+ <nd ref='-96408' />
+ <nd ref='-96406' />
+ <nd ref='-96404' />
+ <nd ref='-96402' />
+ <nd ref='-96400' />
+ <nd ref='-96398' />
+ <nd ref='-96396' />
+ <nd ref='-96394' />
+ <nd ref='-96392' />
+ <nd ref='-96390' />
+ <nd ref='-96388' />
+ <nd ref='-96255' />
+ <nd ref='-96253' />
+ <nd ref='-96245' />
+ <nd ref='-96241' />
+ <nd ref='-96239' />
+ <nd ref='-96231' />
+ <nd ref='-96229' />
+ <nd ref='-96223' />
+ <nd ref='-96221' />
+ <nd ref='-96219' />
+ <nd ref='-96217' />
+ <nd ref='-96213' />
+ <nd ref='-96211' />
+ <nd ref='-96205' />
+ <nd ref='-96203' />
+ <nd ref='-96201' />
+ <nd ref='-96199' />
+ <nd ref='-96197' />
+ <nd ref='-96195' />
+ <nd ref='-96189' />
+ <nd ref='-22276' />
+ <nd ref='-9330' />
+ <nd ref='-9332' />
+ <nd ref='-22284' />
+ <nd ref='-22286' />
+ <nd ref='-22294' />
+ <nd ref='-22292' />
+ <nd ref='-22290' />
+ <nd ref='-22288' />
+ <nd ref='-9334' />
+ <nd ref='-22296' />
+ <nd ref='-22302' />
+ <nd ref='-22304' />
+ <nd ref='-22300' />
+ <nd ref='-22298' />
+ <nd ref='-9336' />
+ <nd ref='-9338' />
+ <nd ref='-9340' />
+ <nd ref='-9342' />
+ <nd ref='-22306' />
+ <nd ref='-22308' />
+ <nd ref='-22312' />
+ <nd ref='-9346' />
+ <nd ref='-9348' />
+ <nd ref='-9352' />
+ <nd ref='-9354' />
+ <nd ref='-9356' />
+ <nd ref='-9358' />
+ <nd ref='-9360' />
+ <nd ref='-9362' />
+ <nd ref='-9364' />
+ <nd ref='-9366' />
+ <nd ref='-9368' />
+ <nd ref='-9370' />
+ <nd ref='-9372' />
+ <tag k='ISO3166-2' v='IN-RJ' />
+ <tag k='name:en' v='Rajasthan' />
+ </way>
+ <way id='-97175'>
+ <nd ref='-94814' />
+ <nd ref='-97174' />
+ <nd ref='-97176' />
+ <nd ref='-97178' />
+ <nd ref='-97180' />
+ <nd ref='-97182' />
+ <nd ref='-97184' />
+ <nd ref='-97186' />
+ <nd ref='-97188' />
+ <nd ref='-97190' />
+ <nd ref='-97192' />
+ <nd ref='-97194' />
+ <nd ref='-97196' />
+ <nd ref='-97198' />
+ <nd ref='-97200' />
+ <nd ref='-97202' />
+ <nd ref='-97204' />
+ <nd ref='-97206' />
+ <nd ref='-97208' />
+ <nd ref='-97210' />
+ <nd ref='-97212' />
+ <nd ref='-97214' />
+ <nd ref='-97216' />
+ <nd ref='-97218' />
+ <nd ref='-97220' />
+ <nd ref='-97222' />
+ <nd ref='-97224' />
+ <nd ref='-97226' />
+ <nd ref='-97228' />
+ <nd ref='-97230' />
+ <nd ref='-97232' />
+ <nd ref='-97234' />
+ <nd ref='-97236' />
+ <nd ref='-97238' />
+ <nd ref='-97240' />
+ <nd ref='-97242' />
+ <nd ref='-97244' />
+ <nd ref='-97246' />
+ <nd ref='-97248' />
+ <nd ref='-97250' />
+ <nd ref='-97252' />
+ <nd ref='-97254' />
+ <nd ref='-97256' />
+ <nd ref='-97258' />
+ <nd ref='-97260' />
+ <nd ref='-97262' />
+ <nd ref='-97264' />
+ <nd ref='-97266' />
+ <nd ref='-97268' />
+ <nd ref='-97270' />
+ <nd ref='-97272' />
+ <nd ref='-97274' />
+ <nd ref='-97276' />
+ <nd ref='-97278' />
+ <nd ref='-97280' />
+ <nd ref='-97282' />
+ <nd ref='-97284' />
+ <nd ref='-97286' />
+ <nd ref='-97288' />
+ <nd ref='-97290' />
+ <nd ref='-97292' />
+ <nd ref='-97294' />
+ <nd ref='-97296' />
+ <nd ref='-97298' />
+ <nd ref='-97300' />
+ <nd ref='-97302' />
+ <nd ref='-97304' />
+ <nd ref='-97306' />
+ <nd ref='-97308' />
+ <nd ref='-97310' />
+ <nd ref='-97312' />
+ <nd ref='-97314' />
+ <nd ref='-97316' />
+ <nd ref='-97318' />
+ <nd ref='-97320' />
+ <nd ref='-97322' />
+ <nd ref='-97324' />
+ <nd ref='-97326' />
+ <nd ref='-97328' />
+ <nd ref='-97330' />
+ <nd ref='-97332' />
+ <nd ref='-97334' />
+ <nd ref='-97336' />
+ <nd ref='-97338' />
+ <nd ref='-97340' />
+ <nd ref='-97342' />
+ <nd ref='-97344' />
+ <nd ref='-97346' />
+ <nd ref='-97348' />
+ <nd ref='-97350' />
+ <nd ref='-97352' />
+ <nd ref='-97354' />
+ <nd ref='-97356' />
+ <nd ref='-97358' />
+ <nd ref='-97360' />
+ <nd ref='-97362' />
+ <nd ref='-97364' />
+ <nd ref='-97366' />
+ <nd ref='-97368' />
+ <nd ref='-97370' />
+ <nd ref='-97372' />
+ <nd ref='-97374' />
+ <nd ref='-94758' />
+ <nd ref='-94760' />
+ <nd ref='-94853' />
+ <nd ref='-94762' />
+ <nd ref='-94764' />
+ <nd ref='-94766' />
+ <nd ref='-94881' />
+ <nd ref='-94768' />
+ <nd ref='-94913' />
+ <nd ref='-94957' />
+ <nd ref='-94933' />
+ <nd ref='-94770' />
+ <nd ref='-94772' />
+ <nd ref='-94774' />
+ <nd ref='-94977' />
+ <nd ref='-94987' />
+ <nd ref='-94776' />
+ <nd ref='-94778' />
+ <nd ref='-94780' />
+ <nd ref='-95002' />
+ <nd ref='-94782' />
+ <nd ref='-94784' />
+ <nd ref='-94786' />
+ <nd ref='-95046' />
+ <nd ref='-94788' />
+ <nd ref='-94790' />
+ <nd ref='-94792' />
+ <nd ref='-94794' />
+ <nd ref='-94796' />
+ <nd ref='-94798' />
+ <nd ref='-94800' />
+ <nd ref='-95078' />
+ <nd ref='-94802' />
+ <nd ref='-94804' />
+ <nd ref='-95119' />
+ <nd ref='-94806' />
+ <nd ref='-94808' />
+ <nd ref='-94810' />
+ <nd ref='-94812' />
+ <nd ref='-94814' />
+ <tag k='ISO3166-2' v='IN-DL' />
+ <tag k='name:en' v='Delhi' />
+ </way>
+ <way id='-97433'>
+ <nd ref='-97431' />
+ <nd ref='-97432' />
+ <nd ref='-97434' />
+ <nd ref='-97436' />
+ <nd ref='-97438' />
+ <nd ref='-97440' />
+ <nd ref='-97442' />
+ <nd ref='-97444' />
+ <nd ref='-97446' />
+ <nd ref='-97448' />
+ <nd ref='-97450' />
+ <nd ref='-97452' />
+ <nd ref='-97454' />
+ <nd ref='-97456' />
+ <nd ref='-97458' />
+ <nd ref='-97460' />
+ <nd ref='-97462' />
+ <nd ref='-97464' />
+ <nd ref='-97466' />
+ <nd ref='-97468' />
+ <nd ref='-97470' />
+ <nd ref='-97472' />
+ <nd ref='-97431' />
+ <tag k='ISO3166-2' v='IN-CH' />
+ <tag k='name:en' v='Chandigarh' />
+ </way>
+ <way id='-97488'>
+ <nd ref='-97432' />
+ <nd ref='-97487' />
+ <nd ref='-97489' />
+ <nd ref='-97491' />
+ <nd ref='-97493' />
+ <nd ref='-97495' />
+ <nd ref='-97497' />
+ <nd ref='-97499' />
+ <nd ref='-97501' />
+ <nd ref='-97503' />
+ <nd ref='-97505' />
+ <nd ref='-97507' />
+ <nd ref='-97509' />
+ <nd ref='-97511' />
+ <nd ref='-97513' />
+ <nd ref='-97515' />
+ <nd ref='-97517' />
+ <nd ref='-97519' />
+ <nd ref='-97523' />
+ <nd ref='-97525' />
+ <nd ref='-97527' />
+ <nd ref='-97531' />
+ <nd ref='-97537' />
+ <nd ref='-97549' />
+ <nd ref='-97559' />
+ <nd ref='-97561' />
+ <nd ref='-97563' />
+ <nd ref='-97565' />
+ <nd ref='-97567' />
+ <nd ref='-97569' />
+ <nd ref='-97579' />
+ <nd ref='-97585' />
+ <nd ref='-97587' />
+ <nd ref='-97589' />
+ <nd ref='-97591' />
+ <nd ref='-97593' />
+ <nd ref='-97595' />
+ <nd ref='-97597' />
+ <nd ref='-97599' />
+ <nd ref='-97601' />
+ <nd ref='-97603' />
+ <nd ref='-97605' />
+ <nd ref='-97607' />
+ <nd ref='-97609' />
+ <nd ref='-97611' />
+ <nd ref='-97613' />
+ <nd ref='-97615' />
+ <nd ref='-97617' />
+ <nd ref='-97619' />
+ <nd ref='-97621' />
+ <nd ref='-97623' />
+ <nd ref='-97625' />
+ <nd ref='-97627' />
+ <nd ref='-97629' />
+ <nd ref='-97631' />
+ <nd ref='-97633' />
+ <nd ref='-97635' />
+ <nd ref='-97637' />
+ <nd ref='-97639' />
+ <nd ref='-97641' />
+ <nd ref='-97643' />
+ <nd ref='-97647' />
+ <nd ref='-97649' />
+ <nd ref='-97651' />
+ <nd ref='-97653' />
+ <nd ref='-97655' />
+ <nd ref='-96809' />
+ <nd ref='-96811' />
+ <nd ref='-96813' />
+ <nd ref='-96815' />
+ <nd ref='-96817' />
+ <nd ref='-96819' />
+ <nd ref='-96821' />
+ <nd ref='-96823' />
+ <nd ref='-96825' />
+ <nd ref='-96833' />
+ <nd ref='-96839' />
+ <nd ref='-96841' />
+ <nd ref='-96845' />
+ <nd ref='-96847' />
+ <nd ref='-96849' />
+ <nd ref='-96853' />
+ <nd ref='-96855' />
+ <nd ref='-96857' />
+ <nd ref='-96859' />
+ <nd ref='-96861' />
+ <nd ref='-96863' />
+ <nd ref='-96865' />
+ <nd ref='-96873' />
+ <nd ref='-96875' />
+ <nd ref='-96877' />
+ <nd ref='-96881' />
+ <nd ref='-96887' />
+ <nd ref='-96889' />
+ <nd ref='-96891' />
+ <nd ref='-96895' />
+ <nd ref='-96897' />
+ <nd ref='-96899' />
+ <nd ref='-96901' />
+ <nd ref='-96903' />
+ <nd ref='-96905' />
+ <nd ref='-96907' />
+ <nd ref='-96909' />
+ <nd ref='-96911' />
+ <nd ref='-96913' />
+ <nd ref='-96915' />
+ <nd ref='-96925' />
+ <nd ref='-96927' />
+ <nd ref='-96929' />
+ <nd ref='-96931' />
+ <nd ref='-96933' />
+ <nd ref='-96935' />
+ <nd ref='-96937' />
+ <nd ref='-96941' />
+ <nd ref='-96943' />
+ <nd ref='-96945' />
+ <nd ref='-96947' />
+ <nd ref='-95179' />
+ <nd ref='-95171' />
+ <nd ref='-95169' />
+ <nd ref='-95167' />
+ <nd ref='-95165' />
+ <nd ref='-95163' />
+ <nd ref='-95161' />
+ <nd ref='-95159' />
+ <nd ref='-95157' />
+ <nd ref='-95155' />
+ <nd ref='-95153' />
+ <nd ref='-95151' />
+ <nd ref='-95149' />
+ <nd ref='-95147' />
+ <nd ref='-94820' />
+ <nd ref='-95144' />
+ <nd ref='-94818' />
+ <nd ref='-94835' />
+ <nd ref='-94816' />
+ <nd ref='-94814' />
+ <nd ref='-97174' />
+ <nd ref='-97176' />
+ <nd ref='-97178' />
+ <nd ref='-97180' />
+ <nd ref='-97182' />
+ <nd ref='-97184' />
+ <nd ref='-97186' />
+ <nd ref='-97188' />
+ <nd ref='-97190' />
+ <nd ref='-97192' />
+ <nd ref='-97194' />
+ <nd ref='-97196' />
+ <nd ref='-97198' />
+ <nd ref='-97200' />
+ <nd ref='-97202' />
+ <nd ref='-97204' />
+ <nd ref='-97206' />
+ <nd ref='-97208' />
+ <nd ref='-97210' />
+ <nd ref='-97212' />
+ <nd ref='-97214' />
+ <nd ref='-97216' />
+ <nd ref='-97218' />
+ <nd ref='-97220' />
+ <nd ref='-97222' />
+ <nd ref='-97224' />
+ <nd ref='-97226' />
+ <nd ref='-97228' />
+ <nd ref='-97230' />
+ <nd ref='-97232' />
+ <nd ref='-97234' />
+ <nd ref='-97236' />
+ <nd ref='-97238' />
+ <nd ref='-97240' />
+ <nd ref='-97242' />
+ <nd ref='-97244' />
+ <nd ref='-97246' />
+ <nd ref='-97248' />
+ <nd ref='-97250' />
+ <nd ref='-97252' />
+ <nd ref='-97254' />
+ <nd ref='-97256' />
+ <nd ref='-97258' />
+ <nd ref='-97260' />
+ <nd ref='-97262' />
+ <nd ref='-97264' />
+ <nd ref='-97266' />
+ <nd ref='-97268' />
+ <nd ref='-97270' />
+ <nd ref='-97272' />
+ <nd ref='-97274' />
+ <nd ref='-97276' />
+ <nd ref='-97278' />
+ <nd ref='-97280' />
+ <nd ref='-97282' />
+ <nd ref='-97284' />
+ <nd ref='-97286' />
+ <nd ref='-97288' />
+ <nd ref='-97290' />
+ <nd ref='-97292' />
+ <nd ref='-97294' />
+ <nd ref='-97296' />
+ <nd ref='-97298' />
+ <nd ref='-97300' />
+ <nd ref='-97302' />
+ <nd ref='-97304' />
+ <nd ref='-97306' />
+ <nd ref='-97308' />
+ <nd ref='-97310' />
+ <nd ref='-97312' />
+ <nd ref='-97314' />
+ <nd ref='-97316' />
+ <nd ref='-97318' />
+ <nd ref='-97320' />
+ <nd ref='-97322' />
+ <nd ref='-97324' />
+ <nd ref='-97326' />
+ <nd ref='-97328' />
+ <nd ref='-97330' />
+ <nd ref='-97332' />
+ <nd ref='-97334' />
+ <nd ref='-97336' />
+ <nd ref='-97338' />
+ <nd ref='-97340' />
+ <nd ref='-97342' />
+ <nd ref='-97344' />
+ <nd ref='-97346' />
+ <nd ref='-97348' />
+ <nd ref='-97350' />
+ <nd ref='-97352' />
+ <nd ref='-97354' />
+ <nd ref='-97356' />
+ <nd ref='-97358' />
+ <nd ref='-97360' />
+ <nd ref='-97362' />
+ <nd ref='-97364' />
+ <nd ref='-97366' />
+ <nd ref='-97368' />
+ <nd ref='-97370' />
+ <nd ref='-97372' />
+ <nd ref='-97374' />
+ <nd ref='-94758' />
+ <nd ref='-94756' />
+ <nd ref='-94754' />
+ <nd ref='-94752' />
+ <nd ref='-94750' />
+ <nd ref='-94748' />
+ <nd ref='-94746' />
+ <nd ref='-92746' />
+ <nd ref='-97859' />
+ <nd ref='-97861' />
+ <nd ref='-97863' />
+ <nd ref='-97865' />
+ <nd ref='-97867' />
+ <nd ref='-97431' />
+ <nd ref='-97432' />
+ <tag k='ISO3166-2' v='IN-HR' />
+ <tag k='name:en' v='Haryana' />
+ </way>
+ <way id='-97886'>
+ <nd ref='-97883' />
+ <nd ref='-97885' />
+ <nd ref='-97887' />
+ <nd ref='-97889' />
+ <nd ref='-97891' />
+ <nd ref='-97893' />
+ <nd ref='-97895' />
+ <nd ref='-97897' />
+ <nd ref='-97899' />
+ <nd ref='-97901' />
+ <nd ref='-97903' />
+ <nd ref='-97905' />
+ <nd ref='-97907' />
+ <nd ref='-97909' />
+ <nd ref='-97911' />
+ <nd ref='-97913' />
+ <nd ref='-97915' />
+ <nd ref='-97917' />
+ <nd ref='-97867' />
+ <nd ref='-97865' />
+ <nd ref='-97863' />
+ <nd ref='-97861' />
+ <nd ref='-97859' />
+ <nd ref='-92746' />
+ <nd ref='-92742' />
+ <nd ref='-92740' />
+ <nd ref='-92738' />
+ <nd ref='-92736' />
+ <nd ref='-92734' />
+ <nd ref='-92732' />
+ <nd ref='-92730' />
+ <nd ref='-22230' />
+ <nd ref='-22228' />
+ <nd ref='-7814' />
+ <nd ref='-22224' />
+ <nd ref='-22226' />
+ <nd ref='-7816' />
+ <nd ref='-27542' />
+ <nd ref='-22218' />
+ <nd ref='-22220' />
+ <nd ref='-22214' />
+ <nd ref='-92580' />
+ <nd ref='-92582' />
+ <nd ref='-92584' />
+ <nd ref='-92586' />
+ <nd ref='-92588' />
+ <nd ref='-92590' />
+ <nd ref='-92592' />
+ <nd ref='-92594' />
+ <nd ref='-92596' />
+ <nd ref='-92598' />
+ <nd ref='-97883' />
+ <tag k='ISO3166-2' v='IN-HP' />
+ <tag k='name:en' v='Himachal Pradesh' />
+ </way>
+ <way id='-97967'>
+ <nd ref='-96807' />
+ <nd ref='-96809' />
+ <nd ref='-97655' />
+ <nd ref='-97653' />
+ <nd ref='-97651' />
+ <nd ref='-97649' />
+ <nd ref='-97647' />
+ <nd ref='-97643' />
+ <nd ref='-97641' />
+ <nd ref='-97639' />
+ <nd ref='-97637' />
+ <nd ref='-97635' />
+ <nd ref='-97633' />
+ <nd ref='-97631' />
+ <nd ref='-97629' />
+ <nd ref='-97627' />
+ <nd ref='-97625' />
+ <nd ref='-97623' />
+ <nd ref='-97621' />
+ <nd ref='-97619' />
+ <nd ref='-97617' />
+ <nd ref='-97615' />
+ <nd ref='-97613' />
+ <nd ref='-97611' />
+ <nd ref='-97609' />
+ <nd ref='-97607' />
+ <nd ref='-97605' />
+ <nd ref='-97603' />
+ <nd ref='-97601' />
+ <nd ref='-97599' />
+ <nd ref='-97597' />
+ <nd ref='-97595' />
+ <nd ref='-97593' />
+ <nd ref='-97591' />
+ <nd ref='-97589' />
+ <nd ref='-97587' />
+ <nd ref='-97585' />
+ <nd ref='-97579' />
+ <nd ref='-97569' />
+ <nd ref='-97567' />
+ <nd ref='-97565' />
+ <nd ref='-97563' />
+ <nd ref='-97561' />
+ <nd ref='-97559' />
+ <nd ref='-97549' />
+ <nd ref='-97537' />
+ <nd ref='-97531' />
+ <nd ref='-97527' />
+ <nd ref='-97525' />
+ <nd ref='-97523' />
+ <nd ref='-97519' />
+ <nd ref='-97517' />
+ <nd ref='-97515' />
+ <nd ref='-97513' />
+ <nd ref='-97511' />
+ <nd ref='-97509' />
+ <nd ref='-97507' />
+ <nd ref='-97505' />
+ <nd ref='-97503' />
+ <nd ref='-97501' />
+ <nd ref='-97499' />
+ <nd ref='-97497' />
+ <nd ref='-97495' />
+ <nd ref='-97493' />
+ <nd ref='-97491' />
+ <nd ref='-97489' />
+ <nd ref='-97487' />
+ <nd ref='-97432' />
+ <nd ref='-97434' />
+ <nd ref='-97436' />
+ <nd ref='-97438' />
+ <nd ref='-97440' />
+ <nd ref='-97442' />
+ <nd ref='-97444' />
+ <nd ref='-97446' />
+ <nd ref='-97448' />
+ <nd ref='-97450' />
+ <nd ref='-97452' />
+ <nd ref='-97454' />
+ <nd ref='-97456' />
+ <nd ref='-97458' />
+ <nd ref='-97460' />
+ <nd ref='-97462' />
+ <nd ref='-97464' />
+ <nd ref='-97466' />
+ <nd ref='-97468' />
+ <nd ref='-97470' />
+ <nd ref='-97472' />
+ <nd ref='-97431' />
+ <nd ref='-97867' />
+ <nd ref='-97917' />
+ <nd ref='-97915' />
+ <nd ref='-97913' />
+ <nd ref='-97911' />
+ <nd ref='-97909' />
+ <nd ref='-97907' />
+ <nd ref='-97905' />
+ <nd ref='-97903' />
+ <nd ref='-97901' />
+ <nd ref='-97899' />
+ <nd ref='-97897' />
+ <nd ref='-97895' />
+ <nd ref='-97893' />
+ <nd ref='-97891' />
+ <nd ref='-97889' />
+ <nd ref='-97887' />
+ <nd ref='-97885' />
+ <nd ref='-97883' />
+ <nd ref='-92600' />
+ <nd ref='-92602' />
+ <nd ref='-92604' />
+ <nd ref='-22350' />
+ <nd ref='-9384' />
+ <nd ref='-22336' />
+ <nd ref='-22344' />
+ <nd ref='-22342' />
+ <nd ref='-22340' />
+ <nd ref='-22338' />
+ <nd ref='-22334' />
+ <nd ref='-9382' />
+ <nd ref='-27554' />
+ <nd ref='-22332' />
+ <nd ref='-22330' />
+ <nd ref='-9380' />
+ <nd ref='-27556' />
+ <nd ref='-9378' />
+ <nd ref='-22318' />
+ <nd ref='-22324' />
+ <nd ref='-22328' />
+ <nd ref='-22326' />
+ <nd ref='-22320' />
+ <nd ref='-22322' />
+ <nd ref='-9376' />
+ <nd ref='-9374' />
+ <nd ref='-22316' />
+ <nd ref='-9372' />
+ <nd ref='-96807' />
+ <tag k='ISO3166-2' v='IN-PB' />
+ <tag k='name:en' v='Punjab' />
+ </way>
+ <way id='-98136'>
+ <nd ref='-2168' />
+ <nd ref='-98135' />
+ <nd ref='-98137' />
+ <nd ref='-98139' />
+ <nd ref='-98141' />
+ <nd ref='-98143' />
+ <nd ref='-98145' />
+ <nd ref='-98147' />
+ <nd ref='-98149' />
+ <nd ref='-98151' />
+ <nd ref='-98153' />
+ <nd ref='-98155' />
+ <nd ref='-98157' />
+ <nd ref='-98159' />
+ <nd ref='-98161' />
+ <nd ref='-98163' />
+ <nd ref='-98165' />
+ <nd ref='-98167' />
+ <nd ref='-98169' />
+ <nd ref='-98171' />
+ <nd ref='-98173' />
+ <nd ref='-98175' />
+ <nd ref='-98177' />
+ <nd ref='-98179' />
+ <nd ref='-98181' />
+ <nd ref='-98183' />
+ <nd ref='-98185' />
+ <nd ref='-22040' />
+ <nd ref='-9288' />
+ <nd ref='-22042' />
+ <nd ref='-22044' />
+ <nd ref='-22048' />
+ <nd ref='-22050' />
+ <nd ref='-22046' />
+ <nd ref='-9286' />
+ <nd ref='-22056' />
+ <nd ref='-22058' />
+ <nd ref='-22062' />
+ <nd ref='-22060' />
+ <nd ref='-22054' />
+ <nd ref='-22052' />
+ <nd ref='-22064' />
+ <nd ref='-9284' />
+ <nd ref='-9282' />
+ <nd ref='-22066' />
+ <nd ref='-22070' />
+ <nd ref='-22074' />
+ <nd ref='-22072' />
+ <nd ref='-22068' />
+ <nd ref='-7800' />
+ <nd ref='-22082' />
+ <nd ref='-22084' />
+ <nd ref='-22090' />
+ <nd ref='-22088' />
+ <nd ref='-22086' />
+ <nd ref='-22076' />
+ <nd ref='-22078' />
+ <nd ref='-22080' />
+ <nd ref='-22096' />
+ <nd ref='-22094' />
+ <nd ref='-22098' />
+ <nd ref='-22100' />
+ <nd ref='-22102' />
+ <nd ref='-22104' />
+ <nd ref='-22092' />
+ <nd ref='-7802' />
+ <nd ref='-22114' />
+ <nd ref='-22116' />
+ <nd ref='-22112' />
+ <nd ref='-22108' />
+ <nd ref='-22120' />
+ <nd ref='-22118' />
+ <nd ref='-22110' />
+ <nd ref='-22106' />
+ <nd ref='-7804' />
+ <nd ref='-22122' />
+ <nd ref='-22124' />
+ <nd ref='-7806' />
+ <nd ref='-7808' />
+ <nd ref='-22126' />
+ <nd ref='-22128' />
+ <nd ref='-22130' />
+ <nd ref='-7810' />
+ <nd ref='-22136' />
+ <nd ref='-22138' />
+ <nd ref='-22140' />
+ <nd ref='-22146' />
+ <nd ref='-22142' />
+ <nd ref='-22144' />
+ <nd ref='-22134' />
+ <nd ref='-22132' />
+ <nd ref='-7326' />
+ <nd ref='-7328' />
+ <nd ref='-2174' />
+ <nd ref='-7330' />
+ <nd ref='-2172' />
+ <nd ref='-2170' />
+ <nd ref='-2166' />
+ <nd ref='-2168' />
+ <tag k='ISO3166-2' v='IN-AP' />
+ <tag k='name:en' v='Andhra Pradesh' />
+ </way>
+ <way id='-98272'>
+ <nd ref='-27426' />
+ <nd ref='-98271' />
+ <nd ref='-98273' />
+ <nd ref='-98275' />
+ <nd ref='-98277' />
+ <nd ref='-98279' />
+ <nd ref='-98281' />
+ <nd ref='-98283' />
+ <nd ref='-98285' />
+ <nd ref='-98287' />
+ <nd ref='-98289' />
+ <nd ref='-98291' />
+ <nd ref='-98293' />
+ <nd ref='-98295' />
+ <nd ref='-98297' />
+ <nd ref='-98299' />
+ <nd ref='-19566' />
+ <nd ref='-19564' />
+ <nd ref='-7024' />
+ <nd ref='-19560' />
+ <nd ref='-19562' />
+ <nd ref='-19558' />
+ <nd ref='-7022' />
+ <nd ref='-27418' />
+ <nd ref='-27420' />
+ <nd ref='-27422' />
+ <nd ref='-27424' />
+ <nd ref='-19556' />
+ <nd ref='-27426' />
+ <tag k='ISO3166-2' v='IN-ML' />
+ <tag k='name:en' v='Meghalaya' />
+ </way>
+ <way id='-98328'>
+ <nd ref='-94057' />
+ <nd ref='-2162' />
+ <nd ref='-27462' />
+ <nd ref='-7332' />
+ <nd ref='-27460' />
+ <nd ref='-2164' />
+ <nd ref='-27454' />
+ <nd ref='-27456' />
+ <nd ref='-27458' />
+ <nd ref='-2168' />
+ <nd ref='-98135' />
+ <nd ref='-98137' />
+ <nd ref='-98139' />
+ <nd ref='-98141' />
+ <nd ref='-98143' />
+ <nd ref='-98145' />
+ <nd ref='-98147' />
+ <nd ref='-98149' />
+ <nd ref='-98151' />
+ <nd ref='-98153' />
+ <nd ref='-98155' />
+ <nd ref='-98157' />
+ <nd ref='-98159' />
+ <nd ref='-98161' />
+ <nd ref='-98163' />
+ <nd ref='-98165' />
+ <nd ref='-98167' />
+ <nd ref='-98169' />
+ <nd ref='-98171' />
+ <nd ref='-98173' />
+ <nd ref='-98175' />
+ <nd ref='-98177' />
+ <nd ref='-98179' />
+ <nd ref='-98181' />
+ <nd ref='-98183' />
+ <nd ref='-98185' />
+ <nd ref='-98363' />
+ <nd ref='-98365' />
+ <nd ref='-98367' />
+ <nd ref='-98369' />
+ <nd ref='-98371' />
+ <nd ref='-98373' />
+ <nd ref='-98375' />
+ <nd ref='-98377' />
+ <nd ref='-98379' />
+ <nd ref='-98381' />
+ <nd ref='-98383' />
+ <nd ref='-98385' />
+ <nd ref='-98387' />
+ <nd ref='-98389' />
+ <nd ref='-98391' />
+ <nd ref='-98393' />
+ <nd ref='-98395' />
+ <nd ref='-98397' />
+ <nd ref='-98399' />
+ <nd ref='-98401' />
+ <nd ref='-98403' />
+ <nd ref='-98405' />
+ <nd ref='-98558' />
+ <nd ref='-98407' />
+ <nd ref='-98409' />
+ <nd ref='-98411' />
+ <nd ref='-98413' />
+ <nd ref='-19568' />
+ <nd ref='-19570' />
+ <nd ref='-19572' />
+ <nd ref='-98299' />
+ <nd ref='-98297' />
+ <nd ref='-98295' />
+ <nd ref='-98293' />
+ <nd ref='-98291' />
+ <nd ref='-98289' />
+ <nd ref='-98287' />
+ <nd ref='-98285' />
+ <nd ref='-98283' />
+ <nd ref='-98281' />
+ <nd ref='-98279' />
+ <nd ref='-98277' />
+ <nd ref='-98275' />
+ <nd ref='-98273' />
+ <nd ref='-98271' />
+ <nd ref='-27426' />
+ <nd ref='-7020' />
+ <nd ref='-27428' />
+ <nd ref='-19552' />
+ <nd ref='-19554' />
+ <nd ref='-27430' />
+ <nd ref='-27432' />
+ <nd ref='-19550' />
+ <nd ref='-94051' />
+ <nd ref='-94053' />
+ <nd ref='-94055' />
+ <nd ref='-94057' />
+ <tag k='ISO3166-2' v='IN-AS' />
+ <tag k='name:en' v='Assam' />
+ </way>
+ <way id='-98462'>
+ <nd ref='-98389' />
+ <nd ref='-98461' />
+ <nd ref='-98463' />
+ <nd ref='-98465' />
+ <nd ref='-98467' />
+ <nd ref='-98469' />
+ <nd ref='-22024' />
+ <nd ref='-22026' />
+ <nd ref='-9290' />
+ <nd ref='-22034' />
+ <nd ref='-22036' />
+ <nd ref='-22038' />
+ <nd ref='-22040' />
+ <nd ref='-98185' />
+ <nd ref='-98363' />
+ <nd ref='-98365' />
+ <nd ref='-98367' />
+ <nd ref='-98369' />
+ <nd ref='-98371' />
+ <nd ref='-98373' />
+ <nd ref='-98375' />
+ <nd ref='-98377' />
+ <nd ref='-98379' />
+ <nd ref='-98381' />
+ <nd ref='-98383' />
+ <nd ref='-98385' />
+ <nd ref='-98387' />
+ <nd ref='-98389' />
+ <tag k='ISO3166-2' v='IN-NL' />
+ <tag k='name:en' v='Nagaland' />
+ </way>
+ <way id='-98514'>
+ <nd ref='-98395' />
+ <nd ref='-98513' />
+ <nd ref='-21988' />
+ <nd ref='-9302' />
+ <nd ref='-21996' />
+ <nd ref='-21998' />
+ <nd ref='-22000' />
+ <nd ref='-9300' />
+ <nd ref='-9298' />
+ <nd ref='-22002' />
+ <nd ref='-22004' />
+ <nd ref='-9296' />
+ <nd ref='-22008' />
+ <nd ref='-27410' />
+ <nd ref='-9294' />
+ <nd ref='-22014' />
+ <nd ref='-22016' />
+ <nd ref='-22018' />
+ <nd ref='-22020' />
+ <nd ref='-22012' />
+ <nd ref='-22010' />
+ <nd ref='-22024' />
+ <nd ref='-98469' />
+ <nd ref='-98467' />
+ <nd ref='-98465' />
+ <nd ref='-98463' />
+ <nd ref='-98461' />
+ <nd ref='-98389' />
+ <nd ref='-98391' />
+ <nd ref='-98393' />
+ <nd ref='-98395' />
+ <tag k='ISO3166-2' v='IN-MN' />
+ <tag k='name:en' v='Manipur' />
+ </way>
+ <way id='-98561'>
+ <nd ref='-98558' />
+ <nd ref='-98560' />
+ <nd ref='-19616' />
+ <nd ref='-19620' />
+ <nd ref='-19618' />
+ <nd ref='-19610' />
+ <nd ref='-19612' />
+ <nd ref='-7038' />
+ <nd ref='-7036' />
+ <nd ref='-19608' />
+ <nd ref='-98580' />
+ <nd ref='-7034' />
+ <nd ref='-19606' />
+ <nd ref='-19604' />
+ <nd ref='-19602' />
+ <nd ref='-19600' />
+ <nd ref='-19598' />
+ <nd ref='-7032' />
+ <nd ref='-19590' />
+ <nd ref='-19592' />
+ <nd ref='-19594' />
+ <nd ref='-19596' />
+ <nd ref='-7030' />
+ <nd ref='-19576' />
+ <nd ref='-19578' />
+ <nd ref='-19580' />
+ <nd ref='-19582' />
+ <nd ref='-19588' />
+ <nd ref='-19586' />
+ <nd ref='-19584' />
+ <nd ref='-7028' />
+ <nd ref='-19574' />
+ <nd ref='-7026' />
+ <nd ref='-98413' />
+ <nd ref='-98411' />
+ <nd ref='-98409' />
+ <nd ref='-98407' />
+ <nd ref='-98558' />
+ <tag k='ISO3166-2' v='IN-TR' />
+ <tag k='name:en' v='Tripura' />
+ </way>
+ <way id='-98630'>
+ <nd ref='-98558' />
+ <nd ref='-98405' />
+ <nd ref='-98403' />
+ <nd ref='-98401' />
+ <nd ref='-98399' />
+ <nd ref='-98397' />
+ <nd ref='-98395' />
+ <nd ref='-98513' />
+ <nd ref='-21988' />
+ <nd ref='-21986' />
+ <nd ref='-21984' />
+ <nd ref='-21992' />
+ <nd ref='-21990' />
+ <nd ref='-21994' />
+ <nd ref='-9304' />
+ <nd ref='-27412' />
+ <nd ref='-9306' />
+ <nd ref='-21982' />
+ <nd ref='-21976' />
+ <nd ref='-21970' />
+ <nd ref='-21974' />
+ <nd ref='-21972' />
+ <nd ref='-21980' />
+ <nd ref='-21978' />
+ <nd ref='-21944' />
+ <nd ref='-21968' />
+ <nd ref='-21966' />
+ <nd ref='-21964' />
+ <nd ref='-21962' />
+ <nd ref='-21960' />
+ <nd ref='-21958' />
+ <nd ref='-21956' />
+ <nd ref='-21954' />
+ <nd ref='-21952' />
+ <nd ref='-21950' />
+ <nd ref='-21946' />
+ <nd ref='-21948' />
+ <nd ref='-7042' />
+ <nd ref='-19626' />
+ <nd ref='-7040' />
+ <nd ref='-19624' />
+ <nd ref='-19622' />
+ <nd ref='-19614' />
+ <nd ref='-19616' />
+ <nd ref='-98560' />
+ <nd ref='-98558' />
+ <tag k='ISO3166-2' v='IN-MZ' />
+ <tag k='name:en' v='Mizoram' />
+ </way>
+ <way id='-98707'>
+ <nd ref='-90195' />
+ <nd ref='-89372' />
+ <nd ref='-89374' />
+ <nd ref='-89376' />
+ <nd ref='-89378' />
+ <nd ref='-89380' />
+ <nd ref='-89382' />
+ <nd ref='-89384' />
+ <nd ref='-89386' />
+ <nd ref='-89388' />
+ <nd ref='-89390' />
+ <nd ref='-89392' />
+ <nd ref='-89394' />
+ <nd ref='-98719' />
+ <nd ref='-98721' />
+ <nd ref='-98723' />
+ <nd ref='-98725' />
+ <nd ref='-98727' />
+ <nd ref='-98729' />
+ <nd ref='-98731' />
+ <nd ref='-98733' />
+ <nd ref='-98735' />
+ <nd ref='-98737' />
+ <nd ref='-98739' />
+ <nd ref='-98741' />
+ <nd ref='-98743' />
+ <nd ref='-98745' />
+ <nd ref='-98747' />
+ <nd ref='-98749' />
+ <nd ref='-98751' />
+ <nd ref='-98753' />
+ <nd ref='-98755' />
+ <nd ref='-98757' />
+ <nd ref='-98759' />
+ <nd ref='-98761' />
+ <nd ref='-98763' />
+ <nd ref='-98765' />
+ <nd ref='-98767' />
+ <nd ref='-98769' />
+ <nd ref='-98771' />
+ <nd ref='-98773' />
+ <nd ref='-98775' />
+ <nd ref='-98777' />
+ <nd ref='-98779' />
+ <nd ref='-98781' />
+ <nd ref='-98783' />
+ <nd ref='-98785' />
+ <nd ref='-98787' />
+ <nd ref='-98789' />
+ <nd ref='-98791' />
+ <nd ref='-98793' />
+ <nd ref='-98795' />
+ <nd ref='-98801' />
+ <nd ref='-98803' />
+ <nd ref='-98805' />
+ <nd ref='-98807' />
+ <nd ref='-98809' />
+ <nd ref='-98811' />
+ <nd ref='-98813' />
+ <nd ref='-98815' />
+ <nd ref='-98817' />
+ <nd ref='-98819' />
+ <nd ref='-98821' />
+ <nd ref='-98823' />
+ <nd ref='-98825' />
+ <nd ref='-98827' />
+ <nd ref='-98829' />
+ <nd ref='-98831' />
+ <nd ref='-86537' />
+ <nd ref='-86539' />
+ <nd ref='-86541' />
+ <nd ref='-86547' />
+ <nd ref='-86555' />
+ <nd ref='-86559' />
+ <nd ref='-86561' />
+ <nd ref='-86563' />
+ <nd ref='-86567' />
+ <nd ref='-86569' />
+ <nd ref='-86573' />
+ <nd ref='-86577' />
+ <nd ref='-86581' />
+ <nd ref='-86603' />
+ <nd ref='-86605' />
+ <nd ref='-86607' />
+ <nd ref='-86609' />
+ <nd ref='-86611' />
+ <nd ref='-86613' />
+ <nd ref='-86615' />
+ <nd ref='-86617' />
+ <nd ref='-86619' />
+ <nd ref='-86621' />
+ <nd ref='-86627' />
+ <nd ref='-86629' />
+ <nd ref='-90119' />
+ <nd ref='-90234' />
+ <nd ref='-90115' />
+ <nd ref='-90143' />
+ <nd ref='-90145' />
+ <nd ref='-90147' />
+ <nd ref='-90149' />
+ <nd ref='-90151' />
+ <nd ref='-90153' />
+ <nd ref='-90155' />
+ <nd ref='-90157' />
+ <nd ref='-90159' />
+ <nd ref='-90161' />
+ <nd ref='-90163' />
+ <nd ref='-90165' />
+ <nd ref='-90167' />
+ <nd ref='-90169' />
+ <nd ref='-90171' />
+ <nd ref='-90173' />
+ <nd ref='-90175' />
+ <nd ref='-90177' />
+ <nd ref='-90179' />
+ <nd ref='-90181' />
+ <nd ref='-90183' />
+ <nd ref='-90185' />
+ <nd ref='-90187' />
+ <nd ref='-90189' />
+ <nd ref='-90191' />
+ <nd ref='-90193' />
+ <nd ref='-90195' />
+ <tag k='ISO3166-2' v='CN-61' />
+ <tag k='name:en' v='Shaanxi' />
+ </way>
+ <way id='-98912'>
+ <nd ref='-87466' />
+ <nd ref='-98911' />
+ <nd ref='-98913' />
+ <nd ref='-98915' />
+ <nd ref='-98917' />
+ <nd ref='-98919' />
+ <nd ref='-98921' />
+ <nd ref='-98923' />
+ <nd ref='-98925' />
+ <nd ref='-98927' />
+ <nd ref='-98929' />
+ <nd ref='-98931' />
+ <nd ref='-98933' />
+ <nd ref='-98935' />
+ <nd ref='-98937' />
+ <nd ref='-98939' />
+ <nd ref='-98941' />
+ <nd ref='-98943' />
+ <nd ref='-98945' />
+ <nd ref='-98947' />
+ <nd ref='-98949' />
+ <nd ref='-98951' />
+ <nd ref='-98953' />
+ <nd ref='-98955' />
+ <nd ref='-98957' />
+ <nd ref='-98959' />
+ <nd ref='-98961' />
+ <nd ref='-98963' />
+ <nd ref='-99011' />
+ <nd ref='-99017' />
+ <nd ref='-99021' />
+ <nd ref='-99023' />
+ <nd ref='-99025' />
+ <nd ref='-99027' />
+ <nd ref='-99029' />
+ <nd ref='-99031' />
+ <nd ref='-99033' />
+ <nd ref='-99035' />
+ <nd ref='-99037' />
+ <nd ref='-99039' />
+ <nd ref='-99041' />
+ <nd ref='-99043' />
+ <nd ref='-99045' />
+ <nd ref='-99047' />
+ <nd ref='-99049' />
+ <nd ref='-99051' />
+ <nd ref='-99053' />
+ <nd ref='-99055' />
+ <nd ref='-99057' />
+ <nd ref='-99059' />
+ <nd ref='-99061' />
+ <nd ref='-99063' />
+ <nd ref='-99065' />
+ <nd ref='-99067' />
+ <nd ref='-99069' />
+ <nd ref='-99071' />
+ <nd ref='-99073' />
+ <nd ref='-99075' />
+ <nd ref='-99077' />
+ <nd ref='-99079' />
+ <nd ref='-99081' />
+ <nd ref='-99083' />
+ <nd ref='-99085' />
+ <nd ref='-99087' />
+ <nd ref='-99089' />
+ <nd ref='-99091' />
+ <nd ref='-99093' />
+ <nd ref='-99095' />
+ <nd ref='-99097' />
+ <nd ref='-99099' />
+ <nd ref='-99101' />
+ <nd ref='-99103' />
+ <nd ref='-99105' />
+ <nd ref='-99107' />
+ <nd ref='-99109' />
+ <nd ref='-99111' />
+ <nd ref='-99113' />
+ <nd ref='-99115' />
+ <nd ref='-99117' />
+ <nd ref='-99119' />
+ <nd ref='-99121' />
+ <nd ref='-99123' />
+ <nd ref='-99125' />
+ <nd ref='-99127' />
+ <nd ref='-99129' />
+ <nd ref='-99131' />
+ <nd ref='-99133' />
+ <nd ref='-89470' />
+ <nd ref='-89472' />
+ <nd ref='-89474' />
+ <nd ref='-89476' />
+ <nd ref='-89478' />
+ <nd ref='-89480' />
+ <nd ref='-89482' />
+ <nd ref='-89484' />
+ <nd ref='-89486' />
+ <nd ref='-89488' />
+ <nd ref='-89490' />
+ <nd ref='-89492' />
+ <nd ref='-89494' />
+ <nd ref='-88384' />
+ <nd ref='-88382' />
+ <nd ref='-88380' />
+ <nd ref='-88378' />
+ <nd ref='-88376' />
+ <nd ref='-88374' />
+ <nd ref='-88372' />
+ <nd ref='-88370' />
+ <nd ref='-88368' />
+ <nd ref='-88366' />
+ <nd ref='-88364' />
+ <nd ref='-88362' />
+ <nd ref='-88360' />
+ <nd ref='-88358' />
+ <nd ref='-88356' />
+ <nd ref='-88354' />
+ <nd ref='-88352' />
+ <nd ref='-88350' />
+ <nd ref='-88348' />
+ <nd ref='-88346' />
+ <nd ref='-88344' />
+ <nd ref='-88342' />
+ <nd ref='-88340' />
+ <nd ref='-88338' />
+ <nd ref='-88336' />
+ <nd ref='-88334' />
+ <nd ref='-88332' />
+ <nd ref='-88330' />
+ <nd ref='-88328' />
+ <nd ref='-88326' />
+ <nd ref='-88324' />
+ <nd ref='-88322' />
+ <nd ref='-88320' />
+ <nd ref='-88318' />
+ <nd ref='-88316' />
+ <nd ref='-87376' />
+ <nd ref='-87378' />
+ <nd ref='-87380' />
+ <nd ref='-87382' />
+ <nd ref='-87384' />
+ <nd ref='-87386' />
+ <nd ref='-87388' />
+ <nd ref='-87390' />
+ <nd ref='-87392' />
+ <nd ref='-87394' />
+ <nd ref='-87396' />
+ <nd ref='-87398' />
+ <nd ref='-87400' />
+ <nd ref='-87402' />
+ <nd ref='-87404' />
+ <nd ref='-87406' />
+ <nd ref='-87408' />
+ <nd ref='-87410' />
+ <nd ref='-87412' />
+ <nd ref='-87414' />
+ <nd ref='-87416' />
+ <nd ref='-87418' />
+ <nd ref='-87420' />
+ <nd ref='-87422' />
+ <nd ref='-87424' />
+ <nd ref='-87426' />
+ <nd ref='-87428' />
+ <nd ref='-87430' />
+ <nd ref='-87432' />
+ <nd ref='-87434' />
+ <nd ref='-87436' />
+ <nd ref='-87438' />
+ <nd ref='-87440' />
+ <nd ref='-87442' />
+ <nd ref='-87444' />
+ <nd ref='-87446' />
+ <nd ref='-87448' />
+ <nd ref='-87450' />
+ <nd ref='-87452' />
+ <nd ref='-87454' />
+ <nd ref='-87456' />
+ <nd ref='-87458' />
+ <nd ref='-87460' />
+ <nd ref='-87462' />
+ <nd ref='-87464' />
+ <nd ref='-87466' />
+ <tag k='ISO3166-2' v='CN-52' />
+ <tag k='name:en' v='Guizhou' />
+ </way>
+ <way id='-99015'>
+ <nd ref='-99011' />
+ <nd ref='-98965' />
+ <nd ref='-98967' />
+ <nd ref='-98969' />
+ <nd ref='-98971' />
+ <nd ref='-98973' />
+ <nd ref='-98975' />
+ <nd ref='-98977' />
+ <nd ref='-98979' />
+ <nd ref='-98981' />
+ <nd ref='-98983' />
+ <nd ref='-98985' />
+ <nd ref='-99758' />
+ <nd ref='-99241' />
+ <nd ref='-99243' />
+ <nd ref='-99245' />
+ <nd ref='-99247' />
+ <nd ref='-99249' />
+ <nd ref='-99251' />
+ <nd ref='-99253' />
+ <nd ref='-99255' />
+ <nd ref='-99257' />
+ <nd ref='-99259' />
+ <nd ref='-99261' />
+ <nd ref='-99263' />
+ <nd ref='-99265' />
+ <nd ref='-99267' />
+ <nd ref='-99269' />
+ <nd ref='-99271' />
+ <nd ref='-99273' />
+ <nd ref='-99275' />
+ <nd ref='-99277' />
+ <nd ref='-99279' />
+ <nd ref='-99281' />
+ <nd ref='-99283' />
+ <nd ref='-99285' />
+ <nd ref='-99287' />
+ <nd ref='-99289' />
+ <nd ref='-99291' />
+ <nd ref='-99293' />
+ <nd ref='-99295' />
+ <nd ref='-99297' />
+ <nd ref='-99299' />
+ <nd ref='-99301' />
+ <nd ref='-99303' />
+ <nd ref='-99305' />
+ <nd ref='-99307' />
+ <nd ref='-99309' />
+ <nd ref='-99311' />
+ <nd ref='-99313' />
+ <nd ref='-99315' />
+ <nd ref='-99317' />
+ <nd ref='-98723' />
+ <nd ref='-98721' />
+ <nd ref='-98719' />
+ <nd ref='-89394' />
+ <nd ref='-89396' />
+ <nd ref='-89398' />
+ <nd ref='-89400' />
+ <nd ref='-89402' />
+ <nd ref='-89404' />
+ <nd ref='-89406' />
+ <nd ref='-89408' />
+ <nd ref='-89410' />
+ <nd ref='-89412' />
+ <nd ref='-89414' />
+ <nd ref='-89416' />
+ <nd ref='-89418' />
+ <nd ref='-89420' />
+ <nd ref='-89422' />
+ <nd ref='-89424' />
+ <nd ref='-89426' />
+ <nd ref='-89428' />
+ <nd ref='-89430' />
+ <nd ref='-89432' />
+ <nd ref='-89434' />
+ <nd ref='-89436' />
+ <nd ref='-89438' />
+ <nd ref='-89440' />
+ <nd ref='-89442' />
+ <nd ref='-89444' />
+ <nd ref='-89446' />
+ <nd ref='-89448' />
+ <nd ref='-89450' />
+ <nd ref='-89452' />
+ <nd ref='-89454' />
+ <nd ref='-89456' />
+ <nd ref='-89458' />
+ <nd ref='-89460' />
+ <nd ref='-89462' />
+ <nd ref='-89464' />
+ <nd ref='-89466' />
+ <nd ref='-89468' />
+ <nd ref='-89470' />
+ <nd ref='-99133' />
+ <nd ref='-99131' />
+ <nd ref='-99129' />
+ <nd ref='-99127' />
+ <nd ref='-99125' />
+ <nd ref='-99123' />
+ <nd ref='-99121' />
+ <nd ref='-99119' />
+ <nd ref='-99117' />
+ <nd ref='-99115' />
+ <nd ref='-99113' />
+ <nd ref='-99111' />
+ <nd ref='-99109' />
+ <nd ref='-99107' />
+ <nd ref='-99105' />
+ <nd ref='-99103' />
+ <nd ref='-99101' />
+ <nd ref='-99099' />
+ <nd ref='-99097' />
+ <nd ref='-99095' />
+ <nd ref='-99093' />
+ <nd ref='-99091' />
+ <nd ref='-99089' />
+ <nd ref='-99087' />
+ <nd ref='-99085' />
+ <nd ref='-99083' />
+ <nd ref='-99081' />
+ <nd ref='-99079' />
+ <nd ref='-99077' />
+ <nd ref='-99075' />
+ <nd ref='-99073' />
+ <nd ref='-99071' />
+ <nd ref='-99069' />
+ <nd ref='-99067' />
+ <nd ref='-99065' />
+ <nd ref='-99063' />
+ <nd ref='-99061' />
+ <nd ref='-99059' />
+ <nd ref='-99057' />
+ <nd ref='-99055' />
+ <nd ref='-99053' />
+ <nd ref='-99051' />
+ <nd ref='-99049' />
+ <nd ref='-99047' />
+ <nd ref='-99045' />
+ <nd ref='-99043' />
+ <nd ref='-99041' />
+ <nd ref='-99039' />
+ <nd ref='-99037' />
+ <nd ref='-99035' />
+ <nd ref='-99033' />
+ <nd ref='-99031' />
+ <nd ref='-99029' />
+ <nd ref='-99027' />
+ <nd ref='-99025' />
+ <nd ref='-99023' />
+ <nd ref='-99021' />
+ <nd ref='-99017' />
+ <nd ref='-99011' />
+ <tag k='ISO3166-2' v='CN-50' />
+ <tag k='name:en' v='Chongqing' />
+ </way>
+ <way id='-99432'>
+ <nd ref='-11960' />
+ <nd ref='-11962' />
+ <nd ref='-11966' />
+ <nd ref='-99434' />
+ <nd ref='-11958' />
+ <nd ref='-11960' />
+ <tag k='ISO3166-2' v='CN-46' />
+ <tag k='name:en' v='Hainan' />
+ </way>
+ <way id='-99452'>
+ <nd ref='-11966' />
+ <nd ref='-99434' />
+ <nd ref='-99504' />
+ <nd ref='-99515' />
+ <nd ref='-99519' />
+ <nd ref='-99521' />
+ <nd ref='-99523' />
+ <nd ref='-99525' />
+ <nd ref='-99527' />
+ <nd ref='-99529' />
+ <nd ref='-99531' />
+ <nd ref='-99537' />
+ <nd ref='-99539' />
+ <nd ref='-99545' />
+ <nd ref='-99547' />
+ <nd ref='-99551' />
+ <nd ref='-99553' />
+ <nd ref='-99555' />
+ <nd ref='-99557' />
+ <nd ref='-99561' />
+ <nd ref='-99563' />
+ <nd ref='-99565' />
+ <nd ref='-99567' />
+ <nd ref='-99569' />
+ <nd ref='-99571' />
+ <nd ref='-99573' />
+ <nd ref='-99575' />
+ <nd ref='-99577' />
+ <nd ref='-99579' />
+ <nd ref='-99581' />
+ <nd ref='-99583' />
+ <nd ref='-99585' />
+ <nd ref='-99587' />
+ <nd ref='-99589' />
+ <nd ref='-99591' />
+ <nd ref='-99593' />
+ <nd ref='-99595' />
+ <nd ref='-99597' />
+ <nd ref='-99599' />
+ <nd ref='-99601' />
+ <nd ref='-99603' />
+ <nd ref='-99605' />
+ <nd ref='-99607' />
+ <nd ref='-99613' />
+ <nd ref='-99615' />
+ <nd ref='-99617' />
+ <nd ref='-99619' />
+ <nd ref='-99621' />
+ <nd ref='-99623' />
+ <nd ref='-99625' />
+ <nd ref='-99627' />
+ <nd ref='-99629' />
+ <nd ref='-99631' />
+ <nd ref='-99633' />
+ <nd ref='-99637' />
+ <nd ref='-99639' />
+ <nd ref='-99641' />
+ <nd ref='-99643' />
+ <nd ref='-99645' />
+ <nd ref='-99647' />
+ <nd ref='-99649' />
+ <nd ref='-99651' />
+ <nd ref='-99657' />
+ <nd ref='-99659' />
+ <nd ref='-99661' />
+ <nd ref='-99663' />
+ <nd ref='-99675' />
+ <nd ref='-99677' />
+ <nd ref='-99679' />
+ <nd ref='-99681' />
+ <nd ref='-99683' />
+ <nd ref='-87520' />
+ <nd ref='-87707' />
+ <nd ref='-87709' />
+ <nd ref='-87711' />
+ <nd ref='-87713' />
+ <nd ref='-87715' />
+ <nd ref='-87717' />
+ <nd ref='-87719' />
+ <nd ref='-87721' />
+ <nd ref='-87727' />
+ <nd ref='-87731' />
+ <nd ref='-87733' />
+ <nd ref='-87845' />
+ <nd ref='-87847' />
+ <nd ref='-87849' />
+ <nd ref='-87851' />
+ <nd ref='-87853' />
+ <nd ref='-87855' />
+ <nd ref='-87857' />
+ <nd ref='-87859' />
+ <nd ref='-87861' />
+ <nd ref='-87863' />
+ <nd ref='-87865' />
+ <nd ref='-87867' />
+ <nd ref='-87869' />
+ <nd ref='-87871' />
+ <nd ref='-87873' />
+ <nd ref='-87875' />
+ <nd ref='-87877' />
+ <nd ref='-87883' />
+ <nd ref='-87885' />
+ <nd ref='-87887' />
+ <nd ref='-87889' />
+ <nd ref='-87891' />
+ <nd ref='-87893' />
+ <nd ref='-87895' />
+ <nd ref='-11966' />
+ </way>
+ <way id='-99761'>
+ <nd ref='-99758' />
+ <nd ref='-99760' />
+ <nd ref='-99762' />
+ <nd ref='-99764' />
+ <nd ref='-99766' />
+ <nd ref='-99768' />
+ <nd ref='-99770' />
+ <nd ref='-99772' />
+ <nd ref='-99774' />
+ <nd ref='-99776' />
+ <nd ref='-99778' />
+ <nd ref='-99780' />
+ <nd ref='-99782' />
+ <nd ref='-99784' />
+ <nd ref='-99786' />
+ <nd ref='-99788' />
+ <nd ref='-99790' />
+ <nd ref='-99792' />
+ <nd ref='-99794' />
+ <nd ref='-99796' />
+ <nd ref='-99798' />
+ <nd ref='-99800' />
+ <nd ref='-99802' />
+ <nd ref='-99804' />
+ <nd ref='-99806' />
+ <nd ref='-99808' />
+ <nd ref='-99810' />
+ <nd ref='-99812' />
+ <nd ref='-99814' />
+ <nd ref='-99816' />
+ <nd ref='-99818' />
+ <nd ref='-99820' />
+ <nd ref='-99822' />
+ <nd ref='-99824' />
+ <nd ref='-99826' />
+ <nd ref='-99828' />
+ <nd ref='-99830' />
+ <nd ref='-99832' />
+ <nd ref='-99834' />
+ <nd ref='-99836' />
+ <nd ref='-99838' />
+ <nd ref='-99840' />
+ <nd ref='-99842' />
+ <nd ref='-99844' />
+ <nd ref='-99846' />
+ <nd ref='-99848' />
+ <nd ref='-99850' />
+ <nd ref='-99852' />
+ <nd ref='-99854' />
+ <nd ref='-99856' />
+ <nd ref='-99858' />
+ <nd ref='-99860' />
+ <nd ref='-99862' />
+ <nd ref='-99864' />
+ <nd ref='-99866' />
+ <nd ref='-99868' />
+ <nd ref='-99870' />
+ <nd ref='-99872' />
+ <nd ref='-99874' />
+ <nd ref='-99876' />
+ <nd ref='-99878' />
+ <nd ref='-99880' />
+ <nd ref='-99882' />
+ <nd ref='-99884' />
+ <nd ref='-99888' />
+ <nd ref='-99890' />
+ <nd ref='-99892' />
+ <nd ref='-99629' />
+ <nd ref='-99631' />
+ <nd ref='-99633' />
+ <nd ref='-99637' />
+ <nd ref='-99639' />
+ <nd ref='-99641' />
+ <nd ref='-99643' />
+ <nd ref='-99645' />
+ <nd ref='-99647' />
+ <nd ref='-99649' />
+ <nd ref='-99651' />
+ <nd ref='-99657' />
+ <nd ref='-99659' />
+ <nd ref='-99661' />
+ <nd ref='-99663' />
+ <nd ref='-99675' />
+ <nd ref='-99677' />
+ <nd ref='-99679' />
+ <nd ref='-99681' />
+ <nd ref='-99683' />
+ <nd ref='-87520' />
+ <nd ref='-87518' />
+ <nd ref='-87516' />
+ <nd ref='-87514' />
+ <nd ref='-87512' />
+ <nd ref='-87510' />
+ <nd ref='-87508' />
+ <nd ref='-87506' />
+ <nd ref='-87504' />
+ <nd ref='-87502' />
+ <nd ref='-87500' />
+ <nd ref='-87498' />
+ <nd ref='-87496' />
+ <nd ref='-87494' />
+ <nd ref='-87492' />
+ <nd ref='-87490' />
+ <nd ref='-87488' />
+ <nd ref='-87486' />
+ <nd ref='-87484' />
+ <nd ref='-87482' />
+ <nd ref='-87480' />
+ <nd ref='-87478' />
+ <nd ref='-87476' />
+ <nd ref='-87474' />
+ <nd ref='-87472' />
+ <nd ref='-87470' />
+ <nd ref='-87468' />
+ <nd ref='-87466' />
+ <nd ref='-98911' />
+ <nd ref='-98913' />
+ <nd ref='-98915' />
+ <nd ref='-98917' />
+ <nd ref='-98919' />
+ <nd ref='-98921' />
+ <nd ref='-98923' />
+ <nd ref='-98925' />
+ <nd ref='-98927' />
+ <nd ref='-98929' />
+ <nd ref='-98931' />
+ <nd ref='-98933' />
+ <nd ref='-98935' />
+ <nd ref='-98937' />
+ <nd ref='-98939' />
+ <nd ref='-98941' />
+ <nd ref='-98943' />
+ <nd ref='-98945' />
+ <nd ref='-98947' />
+ <nd ref='-98949' />
+ <nd ref='-98951' />
+ <nd ref='-98953' />
+ <nd ref='-98955' />
+ <nd ref='-98957' />
+ <nd ref='-98959' />
+ <nd ref='-98961' />
+ <nd ref='-98963' />
+ <nd ref='-99011' />
+ <nd ref='-98965' />
+ <nd ref='-98967' />
+ <nd ref='-98969' />
+ <nd ref='-98971' />
+ <nd ref='-98973' />
+ <nd ref='-98975' />
+ <nd ref='-98977' />
+ <nd ref='-98979' />
+ <nd ref='-98981' />
+ <nd ref='-98983' />
+ <nd ref='-98985' />
+ <nd ref='-99758' />
+ <tag k='ISO3166-2' v='CN-43' />
+ <tag k='name:en' v='Hunan' />
+ </way>
+ <way id='-100002'>
+ <nd ref='-98767' />
+ <nd ref='-100001' />
+ <nd ref='-100003' />
+ <nd ref='-100005' />
+ <nd ref='-100009' />
+ <nd ref='-100013' />
+ <nd ref='-100015' />
+ <nd ref='-100017' />
+ <nd ref='-100019' />
+ <nd ref='-100021' />
+ <nd ref='-100023' />
+ <nd ref='-100025' />
+ <nd ref='-100027' />
+ <nd ref='-100029' />
+ <nd ref='-100031' />
+ <nd ref='-100033' />
+ <nd ref='-100035' />
+ <nd ref='-100037' />
+ <nd ref='-100039' />
+ <nd ref='-100041' />
+ <nd ref='-100357' />
+ <nd ref='-100043' />
+ <nd ref='-100045' />
+ <nd ref='-100047' />
+ <nd ref='-100049' />
+ <nd ref='-100051' />
+ <nd ref='-100053' />
+ <nd ref='-100055' />
+ <nd ref='-100057' />
+ <nd ref='-100059' />
+ <nd ref='-100061' />
+ <nd ref='-100063' />
+ <nd ref='-100065' />
+ <nd ref='-100067' />
+ <nd ref='-100069' />
+ <nd ref='-100071' />
+ <nd ref='-100073' />
+ <nd ref='-100075' />
+ <nd ref='-100077' />
+ <nd ref='-100079' />
+ <nd ref='-100081' />
+ <nd ref='-100083' />
+ <nd ref='-100085' />
+ <nd ref='-100087' />
+ <nd ref='-100089' />
+ <nd ref='-99838' />
+ <nd ref='-99836' />
+ <nd ref='-99834' />
+ <nd ref='-99832' />
+ <nd ref='-99830' />
+ <nd ref='-99828' />
+ <nd ref='-99826' />
+ <nd ref='-99824' />
+ <nd ref='-99822' />
+ <nd ref='-99820' />
+ <nd ref='-99818' />
+ <nd ref='-99816' />
+ <nd ref='-99814' />
+ <nd ref='-99812' />
+ <nd ref='-99810' />
+ <nd ref='-99808' />
+ <nd ref='-99806' />
+ <nd ref='-99804' />
+ <nd ref='-99802' />
+ <nd ref='-99800' />
+ <nd ref='-99798' />
+ <nd ref='-99796' />
+ <nd ref='-99794' />
+ <nd ref='-99792' />
+ <nd ref='-99790' />
+ <nd ref='-99788' />
+ <nd ref='-99786' />
+ <nd ref='-99784' />
+ <nd ref='-99782' />
+ <nd ref='-99780' />
+ <nd ref='-99778' />
+ <nd ref='-99776' />
+ <nd ref='-99774' />
+ <nd ref='-99772' />
+ <nd ref='-99770' />
+ <nd ref='-99768' />
+ <nd ref='-99766' />
+ <nd ref='-99764' />
+ <nd ref='-99762' />
+ <nd ref='-99760' />
+ <nd ref='-99758' />
+ <nd ref='-99243' />
+ <nd ref='-99245' />
+ <nd ref='-99247' />
+ <nd ref='-99249' />
+ <nd ref='-99251' />
+ <nd ref='-99253' />
+ <nd ref='-99255' />
+ <nd ref='-99257' />
+ <nd ref='-99259' />
+ <nd ref='-99261' />
+ <nd ref='-99263' />
+ <nd ref='-99265' />
+ <nd ref='-99267' />
+ <nd ref='-99269' />
+ <nd ref='-99271' />
+ <nd ref='-99273' />
+ <nd ref='-99275' />
+ <nd ref='-99277' />
+ <nd ref='-99279' />
+ <nd ref='-99281' />
+ <nd ref='-99283' />
+ <nd ref='-99285' />
+ <nd ref='-99287' />
+ <nd ref='-99289' />
+ <nd ref='-99291' />
+ <nd ref='-99293' />
+ <nd ref='-99295' />
+ <nd ref='-99297' />
+ <nd ref='-99299' />
+ <nd ref='-99301' />
+ <nd ref='-99303' />
+ <nd ref='-99305' />
+ <nd ref='-99307' />
+ <nd ref='-99309' />
+ <nd ref='-99311' />
+ <nd ref='-99313' />
+ <nd ref='-99315' />
+ <nd ref='-99317' />
+ <nd ref='-98723' />
+ <nd ref='-98725' />
+ <nd ref='-98727' />
+ <nd ref='-98729' />
+ <nd ref='-98731' />
+ <nd ref='-98733' />
+ <nd ref='-98735' />
+ <nd ref='-98737' />
+ <nd ref='-98739' />
+ <nd ref='-98741' />
+ <nd ref='-98743' />
+ <nd ref='-98745' />
+ <nd ref='-98747' />
+ <nd ref='-98749' />
+ <nd ref='-98751' />
+ <nd ref='-98753' />
+ <nd ref='-98755' />
+ <nd ref='-98757' />
+ <nd ref='-98759' />
+ <nd ref='-98761' />
+ <nd ref='-98763' />
+ <nd ref='-98765' />
+ <nd ref='-98767' />
+ <tag k='ISO3166-2' v='CN-42' />
+ <tag k='name:en' v='Hubei' />
+ </way>
+ <way id='-100210'>
+ <nd ref='-98779' />
+ <nd ref='-100209' />
+ <nd ref='-100211' />
+ <nd ref='-100213' />
+ <nd ref='-100215' />
+ <nd ref='-100217' />
+ <nd ref='-100219' />
+ <nd ref='-100221' />
+ <nd ref='-100223' />
+ <nd ref='-100225' />
+ <nd ref='-100227' />
+ <nd ref='-100229' />
+ <nd ref='-100231' />
+ <nd ref='-100233' />
+ <nd ref='-100235' />
+ <nd ref='-100237' />
+ <nd ref='-100239' />
+ <nd ref='-100241' />
+ <nd ref='-100243' />
+ <nd ref='-100245' />
+ <nd ref='-100247' />
+ <nd ref='-100249' />
+ <nd ref='-100251' />
+ <nd ref='-100253' />
+ <nd ref='-100255' />
+ <nd ref='-100259' />
+ <nd ref='-100261' />
+ <nd ref='-100263' />
+ <nd ref='-100265' />
+ <nd ref='-100267' />
+ <nd ref='-100269' />
+ <nd ref='-100271' />
+ <nd ref='-100273' />
+ <nd ref='-100275' />
+ <nd ref='-100277' />
+ <nd ref='-100279' />
+ <nd ref='-100281' />
+ <nd ref='-100283' />
+ <nd ref='-100285' />
+ <nd ref='-100287' />
+ <nd ref='-100289' />
+ <nd ref='-100291' />
+ <nd ref='-100293' />
+ <nd ref='-100295' />
+ <nd ref='-100297' />
+ <nd ref='-100299' />
+ <nd ref='-100301' />
+ <nd ref='-100303' />
+ <nd ref='-100305' />
+ <nd ref='-100307' />
+ <nd ref='-100309' />
+ <nd ref='-100311' />
+ <nd ref='-100313' />
+ <nd ref='-100315' />
+ <nd ref='-100317' />
+ <nd ref='-100319' />
+ <nd ref='-100321' />
+ <nd ref='-100323' />
+ <nd ref='-100325' />
+ <nd ref='-100327' />
+ <nd ref='-100329' />
+ <nd ref='-100331' />
+ <nd ref='-100333' />
+ <nd ref='-100335' />
+ <nd ref='-100337' />
+ <nd ref='-100339' />
+ <nd ref='-100341' />
+ <nd ref='-100343' />
+ <nd ref='-100345' />
+ <nd ref='-100347' />
+ <nd ref='-100349' />
+ <nd ref='-100351' />
+ <nd ref='-100353' />
+ <nd ref='-100355' />
+ <nd ref='-100357' />
+ <nd ref='-100041' />
+ <nd ref='-100039' />
+ <nd ref='-100037' />
+ <nd ref='-100035' />
+ <nd ref='-100033' />
+ <nd ref='-100031' />
+ <nd ref='-100029' />
+ <nd ref='-100027' />
+ <nd ref='-100025' />
+ <nd ref='-100023' />
+ <nd ref='-100021' />
+ <nd ref='-100019' />
+ <nd ref='-100017' />
+ <nd ref='-100015' />
+ <nd ref='-100013' />
+ <nd ref='-100009' />
+ <nd ref='-100005' />
+ <nd ref='-100003' />
+ <nd ref='-100001' />
+ <nd ref='-98767' />
+ <nd ref='-98769' />
+ <nd ref='-98771' />
+ <nd ref='-98773' />
+ <nd ref='-98775' />
+ <nd ref='-98777' />
+ <nd ref='-98779' />
+ <tag k='ISO3166-2' v='CN-41' />
+ <tag k='name:en' v='Henan' />
+ </way>
+ <way id='-100399'>
+ <nd ref='-90624' />
+ <nd ref='-100398' />
+ <nd ref='-100400' />
+ <nd ref='-100402' />
+ <nd ref='-100404' />
+ <nd ref='-100406' />
+ <nd ref='-100408' />
+ <nd ref='-100410' />
+ <nd ref='-100412' />
+ <nd ref='-100414' />
+ <nd ref='-100416' />
+ <nd ref='-100418' />
+ <nd ref='-100420' />
+ <nd ref='-100422' />
+ <nd ref='-100424' />
+ <nd ref='-100249' />
+ <nd ref='-100251' />
+ <nd ref='-100253' />
+ <nd ref='-100255' />
+ <nd ref='-100259' />
+ <nd ref='-100261' />
+ <nd ref='-100263' />
+ <nd ref='-100265' />
+ <nd ref='-100267' />
+ <nd ref='-100269' />
+ <nd ref='-100271' />
+ <nd ref='-100273' />
+ <nd ref='-100275' />
+ <nd ref='-100277' />
+ <nd ref='-100279' />
+ <nd ref='-100281' />
+ <nd ref='-100283' />
+ <nd ref='-100285' />
+ <nd ref='-100287' />
+ <nd ref='-100289' />
+ <nd ref='-100291' />
+ <nd ref='-100293' />
+ <nd ref='-100295' />
+ <nd ref='-100449' />
+ <nd ref='-100451' />
+ <nd ref='-100453' />
+ <nd ref='-100455' />
+ <nd ref='-100457' />
+ <nd ref='-100459' />
+ <nd ref='-100461' />
+ <nd ref='-100463' />
+ <nd ref='-100465' />
+ <nd ref='-100467' />
+ <nd ref='-100469' />
+ <nd ref='-100471' />
+ <nd ref='-100473' />
+ <nd ref='-11932' />
+ <nd ref='-10870' />
+ <nd ref='-90624' />
+ <tag k='ISO3166-2' v='CN-37' />
+ <tag k='name:en' v='Shandong' />
+ </way>
+ <way id='-100491'>
+ <nd ref='-99567' />
+ <nd ref='-100490' />
+ <nd ref='-100492' />
+ <nd ref='-100494' />
+ <nd ref='-100496' />
+ <nd ref='-100498' />
+ <nd ref='-100500' />
+ <nd ref='-100502' />
+ <nd ref='-100504' />
+ <nd ref='-100506' />
+ <nd ref='-100508' />
+ <nd ref='-100510' />
+ <nd ref='-100512' />
+ <nd ref='-100514' />
+ <nd ref='-100516' />
+ <nd ref='-100518' />
+ <nd ref='-100520' />
+ <nd ref='-100522' />
+ <nd ref='-100524' />
+ <nd ref='-100526' />
+ <nd ref='-100528' />
+ <nd ref='-100530' />
+ <nd ref='-100532' />
+ <nd ref='-100534' />
+ <nd ref='-100728' />
+ <nd ref='-100536' />
+ <nd ref='-100538' />
+ <nd ref='-100540' />
+ <nd ref='-100542' />
+ <nd ref='-100544' />
+ <nd ref='-100546' />
+ <nd ref='-100548' />
+ <nd ref='-100550' />
+ <nd ref='-100552' />
+ <nd ref='-100564' />
+ <nd ref='-100569' />
+ <nd ref='-100573' />
+ <nd ref='-100575' />
+ <nd ref='-100577' />
+ <nd ref='-100579' />
+ <nd ref='-100581' />
+ <nd ref='-100583' />
+ <nd ref='-100585' />
+ <nd ref='-100587' />
+ <nd ref='-100589' />
+ <nd ref='-100591' />
+ <nd ref='-100593' />
+ <nd ref='-100595' />
+ <nd ref='-100065' />
+ <nd ref='-100067' />
+ <nd ref='-100069' />
+ <nd ref='-100071' />
+ <nd ref='-100073' />
+ <nd ref='-100075' />
+ <nd ref='-100077' />
+ <nd ref='-100079' />
+ <nd ref='-100081' />
+ <nd ref='-100083' />
+ <nd ref='-100085' />
+ <nd ref='-100087' />
+ <nd ref='-100089' />
+ <nd ref='-99838' />
+ <nd ref='-99840' />
+ <nd ref='-99842' />
+ <nd ref='-99844' />
+ <nd ref='-99846' />
+ <nd ref='-99848' />
+ <nd ref='-99850' />
+ <nd ref='-99852' />
+ <nd ref='-99854' />
+ <nd ref='-99856' />
+ <nd ref='-99858' />
+ <nd ref='-99860' />
+ <nd ref='-99862' />
+ <nd ref='-99864' />
+ <nd ref='-99866' />
+ <nd ref='-99868' />
+ <nd ref='-99870' />
+ <nd ref='-99872' />
+ <nd ref='-99874' />
+ <nd ref='-99876' />
+ <nd ref='-99878' />
+ <nd ref='-99880' />
+ <nd ref='-99882' />
+ <nd ref='-99884' />
+ <nd ref='-99888' />
+ <nd ref='-99890' />
+ <nd ref='-99892' />
+ <nd ref='-99629' />
+ <nd ref='-99627' />
+ <nd ref='-99625' />
+ <nd ref='-99623' />
+ <nd ref='-99621' />
+ <nd ref='-99619' />
+ <nd ref='-99617' />
+ <nd ref='-99615' />
+ <nd ref='-99613' />
+ <nd ref='-99607' />
+ <nd ref='-99605' />
+ <nd ref='-99603' />
+ <nd ref='-99601' />
+ <nd ref='-99599' />
+ <nd ref='-99597' />
+ <nd ref='-99595' />
+ <nd ref='-99593' />
+ <nd ref='-99591' />
+ <nd ref='-99589' />
+ <nd ref='-99587' />
+ <nd ref='-99585' />
+ <nd ref='-99583' />
+ <nd ref='-99581' />
+ <nd ref='-99579' />
+ <nd ref='-99577' />
+ <nd ref='-99575' />
+ <nd ref='-99573' />
+ <nd ref='-99571' />
+ <nd ref='-99569' />
+ <nd ref='-99567' />
+ <tag k='ISO3166-2' v='CN-36' />
+ <tag k='name:en' v='Jiangxi' />
+ </way>
+ <way id='-100567'>
+ <nd ref='-100564' />
+ <nd ref='-100554' />
+ <nd ref='-100556' />
+ <nd ref='-100558' />
+ <nd ref='-100560' />
+ <nd ref='-100562' />
+ <nd ref='-100793' />
+ <nd ref='-100795' />
+ <nd ref='-100797' />
+ <nd ref='-100799' />
+ <nd ref='-100801' />
+ <nd ref='-100803' />
+ <nd ref='-100805' />
+ <nd ref='-100807' />
+ <nd ref='-100809' />
+ <nd ref='-100811' />
+ <nd ref='-100813' />
+ <nd ref='-100815' />
+ <nd ref='-100817' />
+ <nd ref='-100819' />
+ <nd ref='-100821' />
+ <nd ref='-100823' />
+ <nd ref='-100825' />
+ <nd ref='-100827' />
+ <nd ref='-100829' />
+ <nd ref='-100831' />
+ <nd ref='-100833' />
+ <nd ref='-100835' />
+ <nd ref='-100837' />
+ <nd ref='-100839' />
+ <nd ref='-100841' />
+ <nd ref='-100843' />
+ <nd ref='-100845' />
+ <nd ref='-100847' />
+ <nd ref='-100849' />
+ <nd ref='-100851' />
+ <nd ref='-100853' />
+ <nd ref='-100855' />
+ <nd ref='-100857' />
+ <nd ref='-100859' />
+ <nd ref='-100861' />
+ <nd ref='-100863' />
+ <nd ref='-100865' />
+ <nd ref='-100867' />
+ <nd ref='-100869' />
+ <nd ref='-100871' />
+ <nd ref='-100873' />
+ <nd ref='-100875' />
+ <nd ref='-100877' />
+ <nd ref='-100879' />
+ <nd ref='-100881' />
+ <nd ref='-100883' />
+ <nd ref='-100885' />
+ <nd ref='-100887' />
+ <nd ref='-100889' />
+ <nd ref='-100891' />
+ <nd ref='-100893' />
+ <nd ref='-100895' />
+ <nd ref='-100897' />
+ <nd ref='-100899' />
+ <nd ref='-100449' />
+ <nd ref='-100295' />
+ <nd ref='-100297' />
+ <nd ref='-100299' />
+ <nd ref='-100301' />
+ <nd ref='-100303' />
+ <nd ref='-100305' />
+ <nd ref='-100307' />
+ <nd ref='-100309' />
+ <nd ref='-100311' />
+ <nd ref='-100313' />
+ <nd ref='-100315' />
+ <nd ref='-100317' />
+ <nd ref='-100319' />
+ <nd ref='-100321' />
+ <nd ref='-100323' />
+ <nd ref='-100325' />
+ <nd ref='-100327' />
+ <nd ref='-100329' />
+ <nd ref='-100331' />
+ <nd ref='-100333' />
+ <nd ref='-100335' />
+ <nd ref='-100337' />
+ <nd ref='-100339' />
+ <nd ref='-100341' />
+ <nd ref='-100343' />
+ <nd ref='-100345' />
+ <nd ref='-100347' />
+ <nd ref='-100349' />
+ <nd ref='-100351' />
+ <nd ref='-100353' />
+ <nd ref='-100355' />
+ <nd ref='-100357' />
+ <nd ref='-100043' />
+ <nd ref='-100045' />
+ <nd ref='-100047' />
+ <nd ref='-100049' />
+ <nd ref='-100051' />
+ <nd ref='-100053' />
+ <nd ref='-100055' />
+ <nd ref='-100057' />
+ <nd ref='-100059' />
+ <nd ref='-100061' />
+ <nd ref='-100063' />
+ <nd ref='-100065' />
+ <nd ref='-100595' />
+ <nd ref='-100593' />
+ <nd ref='-100591' />
+ <nd ref='-100589' />
+ <nd ref='-100587' />
+ <nd ref='-100585' />
+ <nd ref='-100583' />
+ <nd ref='-100581' />
+ <nd ref='-100579' />
+ <nd ref='-100577' />
+ <nd ref='-100575' />
+ <nd ref='-100573' />
+ <nd ref='-100569' />
+ <nd ref='-100564' />
+ <tag k='ISO3166-2' v='CN-34' />
+ <tag k='name:en' v='Anhui' />
+ </way>
+ <way id='-100680'>
+ <nd ref='-99515' />
+ <nd ref='-99504' />
+ <nd ref='-7764' />
+ <nd ref='-11946' />
+ <nd ref='-7762' />
+ <nd ref='-7760' />
+ <nd ref='-7758' />
+ <nd ref='-11948' />
+ <nd ref='-7756' />
+ <nd ref='-11944' />
+ <nd ref='-100689' />
+ <nd ref='-100692' />
+ <nd ref='-100694' />
+ <nd ref='-100696' />
+ <nd ref='-100698' />
+ <nd ref='-100700' />
+ <nd ref='-100702' />
+ <nd ref='-100704' />
+ <nd ref='-100706' />
+ <nd ref='-100708' />
+ <nd ref='-100710' />
+ <nd ref='-100712' />
+ <nd ref='-100714' />
+ <nd ref='-100716' />
+ <nd ref='-100718' />
+ <nd ref='-100720' />
+ <nd ref='-100722' />
+ <nd ref='-100724' />
+ <nd ref='-100726' />
+ <nd ref='-100728' />
+ <nd ref='-100534' />
+ <nd ref='-100532' />
+ <nd ref='-100530' />
+ <nd ref='-100528' />
+ <nd ref='-100526' />
+ <nd ref='-100524' />
+ <nd ref='-100522' />
+ <nd ref='-100520' />
+ <nd ref='-100518' />
+ <nd ref='-100516' />
+ <nd ref='-100514' />
+ <nd ref='-100512' />
+ <nd ref='-100510' />
+ <nd ref='-100508' />
+ <nd ref='-100506' />
+ <nd ref='-100504' />
+ <nd ref='-100502' />
+ <nd ref='-100500' />
+ <nd ref='-100498' />
+ <nd ref='-100496' />
+ <nd ref='-100494' />
+ <nd ref='-100492' />
+ <nd ref='-100490' />
+ <nd ref='-99567' />
+ <nd ref='-99565' />
+ <nd ref='-99563' />
+ <nd ref='-99561' />
+ <nd ref='-99557' />
+ <nd ref='-99555' />
+ <nd ref='-99553' />
+ <nd ref='-99551' />
+ <nd ref='-99547' />
+ <nd ref='-99545' />
+ <nd ref='-99539' />
+ <nd ref='-99537' />
+ <nd ref='-99531' />
+ <nd ref='-99529' />
+ <nd ref='-99527' />
+ <nd ref='-99525' />
+ <nd ref='-99523' />
+ <nd ref='-99521' />
+ <nd ref='-99519' />
+ <nd ref='-99515' />
+ <tag k='ISO3166-2' v='CN-35' />
+ <tag k='name:en' v='Fujian' />
+ </way>
+ <way id='-100973'>
+ <nd ref='-11942' />
+ <nd ref='-100972' />
+ <nd ref='-100974' />
+ <nd ref='-100976' />
+ <nd ref='-100978' />
+ <nd ref='-100980' />
+ <nd ref='-100982' />
+ <nd ref='-100984' />
+ <nd ref='-100986' />
+ <nd ref='-100988' />
+ <nd ref='-100990' />
+ <nd ref='-100992' />
+ <nd ref='-100994' />
+ <nd ref='-100996' />
+ <nd ref='-100998' />
+ <nd ref='-101000' />
+ <nd ref='-101002' />
+ <nd ref='-101004' />
+ <nd ref='-101006' />
+ <nd ref='-101008' />
+ <nd ref='-101010' />
+ <nd ref='-100815' />
+ <nd ref='-100813' />
+ <nd ref='-100811' />
+ <nd ref='-100809' />
+ <nd ref='-100807' />
+ <nd ref='-100805' />
+ <nd ref='-100803' />
+ <nd ref='-100801' />
+ <nd ref='-100799' />
+ <nd ref='-100797' />
+ <nd ref='-100795' />
+ <nd ref='-100793' />
+ <nd ref='-100562' />
+ <nd ref='-100560' />
+ <nd ref='-100558' />
+ <nd ref='-100556' />
+ <nd ref='-100554' />
+ <nd ref='-100564' />
+ <nd ref='-100552' />
+ <nd ref='-100550' />
+ <nd ref='-100548' />
+ <nd ref='-100546' />
+ <nd ref='-100544' />
+ <nd ref='-100542' />
+ <nd ref='-100540' />
+ <nd ref='-100538' />
+ <nd ref='-100536' />
+ <nd ref='-100728' />
+ <nd ref='-100726' />
+ <nd ref='-100724' />
+ <nd ref='-100722' />
+ <nd ref='-100720' />
+ <nd ref='-100718' />
+ <nd ref='-100716' />
+ <nd ref='-100714' />
+ <nd ref='-100712' />
+ <nd ref='-100710' />
+ <nd ref='-100708' />
+ <nd ref='-100706' />
+ <nd ref='-100704' />
+ <nd ref='-100702' />
+ <nd ref='-100700' />
+ <nd ref='-100698' />
+ <nd ref='-100696' />
+ <nd ref='-100694' />
+ <nd ref='-100692' />
+ <nd ref='-100689' />
+ <nd ref='-11942' />
+ <tag k='ISO3166-2' v='CN-33' />
+ <tag k='name:en' v='Zhejiang' />
+ </way>
+ <way id='-101075'>
+ <nd ref='-100986' />
+ <nd ref='-101074' />
+ <nd ref='-101076' />
+ <nd ref='-101078' />
+ <nd ref='-101080' />
+ <nd ref='-101082' />
+ <nd ref='-101084' />
+ <nd ref='-101086' />
+ <nd ref='-101088' />
+ <nd ref='-101090' />
+ <nd ref='-101092' />
+ <nd ref='-101094' />
+ <nd ref='-101096' />
+ <nd ref='-101098' />
+ <nd ref='-101100' />
+ <nd ref='-101102' />
+ <nd ref='-101104' />
+ <nd ref='-101106' />
+ <nd ref='-101108' />
+ <nd ref='-101110' />
+ <nd ref='-101112' />
+ <nd ref='-101114' />
+ <nd ref='-101116' />
+ <nd ref='-101118' />
+ <nd ref='-11930' />
+ <nd ref='-100473' />
+ <nd ref='-100471' />
+ <nd ref='-100469' />
+ <nd ref='-100467' />
+ <nd ref='-100465' />
+ <nd ref='-100463' />
+ <nd ref='-100461' />
+ <nd ref='-100459' />
+ <nd ref='-100457' />
+ <nd ref='-100455' />
+ <nd ref='-100453' />
+ <nd ref='-100451' />
+ <nd ref='-100449' />
+ <nd ref='-100899' />
+ <nd ref='-100897' />
+ <nd ref='-100895' />
+ <nd ref='-100893' />
+ <nd ref='-100891' />
+ <nd ref='-100889' />
+ <nd ref='-100887' />
+ <nd ref='-100885' />
+ <nd ref='-100883' />
+ <nd ref='-100881' />
+ <nd ref='-100879' />
+ <nd ref='-100877' />
+ <nd ref='-100875' />
+ <nd ref='-100873' />
+ <nd ref='-100871' />
+ <nd ref='-100869' />
+ <nd ref='-100867' />
+ <nd ref='-100865' />
+ <nd ref='-100863' />
+ <nd ref='-100861' />
+ <nd ref='-100859' />
+ <nd ref='-100857' />
+ <nd ref='-100855' />
+ <nd ref='-100853' />
+ <nd ref='-100851' />
+ <nd ref='-100849' />
+ <nd ref='-100847' />
+ <nd ref='-100845' />
+ <nd ref='-100843' />
+ <nd ref='-100841' />
+ <nd ref='-100839' />
+ <nd ref='-100837' />
+ <nd ref='-100835' />
+ <nd ref='-100833' />
+ <nd ref='-100831' />
+ <nd ref='-100829' />
+ <nd ref='-100827' />
+ <nd ref='-100825' />
+ <nd ref='-100823' />
+ <nd ref='-100821' />
+ <nd ref='-100819' />
+ <nd ref='-100817' />
+ <nd ref='-100815' />
+ <nd ref='-101010' />
+ <nd ref='-101008' />
+ <nd ref='-101006' />
+ <nd ref='-101004' />
+ <nd ref='-101002' />
+ <nd ref='-101000' />
+ <nd ref='-100998' />
+ <nd ref='-100996' />
+ <nd ref='-100994' />
+ <nd ref='-100992' />
+ <nd ref='-100990' />
+ <nd ref='-100988' />
+ <nd ref='-100986' />
+ <tag k='ISO3166-2' v='CN-32' />
+ <tag k='name:en' v='Jiangsu' />
+ </way>
+ <way id='-101242'>
+ <nd ref='-11942' />
+ <nd ref='-100972' />
+ <nd ref='-100974' />
+ <nd ref='-100976' />
+ <nd ref='-100978' />
+ <nd ref='-100980' />
+ <nd ref='-100982' />
+ <nd ref='-100984' />
+ <nd ref='-100986' />
+ <nd ref='-101074' />
+ <nd ref='-101076' />
+ <nd ref='-101078' />
+ <nd ref='-101080' />
+ <nd ref='-101082' />
+ <nd ref='-101084' />
+ <nd ref='-101086' />
+ <nd ref='-101088' />
+ <nd ref='-101090' />
+ <nd ref='-101092' />
+ <nd ref='-101094' />
+ <nd ref='-101096' />
+ <nd ref='-101098' />
+ <nd ref='-101100' />
+ <nd ref='-101102' />
+ <nd ref='-101104' />
+ <nd ref='-101106' />
+ <nd ref='-101108' />
+ <nd ref='-101110' />
+ <nd ref='-101112' />
+ <nd ref='-101114' />
+ <nd ref='-101116' />
+ <nd ref='-101118' />
+ <nd ref='-11942' />
+ <tag k='ISO3166-2' v='CN-31' />
+ <tag k='name:en' v='Shanghai' />
+ </way>
+ <way id='-101286'>
+ <nd ref='-98779' />
+ <nd ref='-98781' />
+ <nd ref='-98783' />
+ <nd ref='-98785' />
+ <nd ref='-98787' />
+ <nd ref='-98789' />
+ <nd ref='-98791' />
+ <nd ref='-98793' />
+ <nd ref='-98795' />
+ <nd ref='-98801' />
+ <nd ref='-98803' />
+ <nd ref='-98805' />
+ <nd ref='-98807' />
+ <nd ref='-98809' />
+ <nd ref='-98811' />
+ <nd ref='-98813' />
+ <nd ref='-98815' />
+ <nd ref='-98817' />
+ <nd ref='-98819' />
+ <nd ref='-98821' />
+ <nd ref='-98823' />
+ <nd ref='-98825' />
+ <nd ref='-98827' />
+ <nd ref='-98829' />
+ <nd ref='-98831' />
+ <nd ref='-86537' />
+ <nd ref='-86535' />
+ <nd ref='-86533' />
+ <nd ref='-86531' />
+ <nd ref='-86529' />
+ <nd ref='-86527' />
+ <nd ref='-86525' />
+ <nd ref='-86523' />
+ <nd ref='-86521' />
+ <nd ref='-86519' />
+ <nd ref='-86517' />
+ <nd ref='-86515' />
+ <nd ref='-86513' />
+ <nd ref='-86511' />
+ <nd ref='-86509' />
+ <nd ref='-86507' />
+ <nd ref='-86505' />
+ <nd ref='-86503' />
+ <nd ref='-86501' />
+ <nd ref='-86499' />
+ <nd ref='-86497' />
+ <nd ref='-86495' />
+ <nd ref='-86493' />
+ <nd ref='-86491' />
+ <nd ref='-86489' />
+ <nd ref='-86487' />
+ <nd ref='-86485' />
+ <nd ref='-86483' />
+ <nd ref='-101340' />
+ <nd ref='-101342' />
+ <nd ref='-101344' />
+ <nd ref='-101346' />
+ <nd ref='-101348' />
+ <nd ref='-101350' />
+ <nd ref='-101352' />
+ <nd ref='-101354' />
+ <nd ref='-101356' />
+ <nd ref='-101358' />
+ <nd ref='-101360' />
+ <nd ref='-101362' />
+ <nd ref='-101364' />
+ <nd ref='-101366' />
+ <nd ref='-101368' />
+ <nd ref='-101372' />
+ <nd ref='-101374' />
+ <nd ref='-101376' />
+ <nd ref='-101378' />
+ <nd ref='-101380' />
+ <nd ref='-101382' />
+ <nd ref='-100235' />
+ <nd ref='-100233' />
+ <nd ref='-100231' />
+ <nd ref='-100229' />
+ <nd ref='-100227' />
+ <nd ref='-100225' />
+ <nd ref='-100223' />
+ <nd ref='-100221' />
+ <nd ref='-100219' />
+ <nd ref='-100217' />
+ <nd ref='-100215' />
+ <nd ref='-100213' />
+ <nd ref='-100211' />
+ <nd ref='-100209' />
+ <nd ref='-98779' />
+ <tag k='ISO3166-2' v='CN-14' />
+ <tag k='name:en' v='Shanxi' />
+ </way>
+ <way id='-101411'>
+ <nd ref='-101382' />
+ <nd ref='-100235' />
+ <nd ref='-100237' />
+ <nd ref='-100239' />
+ <nd ref='-100241' />
+ <nd ref='-100243' />
+ <nd ref='-100245' />
+ <nd ref='-100247' />
+ <nd ref='-100249' />
+ <nd ref='-100424' />
+ <nd ref='-100422' />
+ <nd ref='-100420' />
+ <nd ref='-100418' />
+ <nd ref='-100416' />
+ <nd ref='-100414' />
+ <nd ref='-100412' />
+ <nd ref='-100410' />
+ <nd ref='-100408' />
+ <nd ref='-100406' />
+ <nd ref='-100404' />
+ <nd ref='-100402' />
+ <nd ref='-100400' />
+ <nd ref='-100398' />
+ <nd ref='-101433' />
+ <nd ref='-101435' />
+ <nd ref='-101437' />
+ <nd ref='-101439' />
+ <nd ref='-101441' />
+ <nd ref='-101443' />
+ <nd ref='-101445' />
+ <nd ref='-101447' />
+ <nd ref='-101449' />
+ <nd ref='-101451' />
+ <nd ref='-101453' />
+ <nd ref='-101455' />
+ <nd ref='-101457' />
+ <nd ref='-101459' />
+ <nd ref='-101461' />
+ <nd ref='-101463' />
+ <nd ref='-101465' />
+ <nd ref='-101467' />
+ <nd ref='-101469' />
+ <nd ref='-101471' />
+ <nd ref='-101473' />
+ <nd ref='-101475' />
+ <nd ref='-101477' />
+ <nd ref='-101479' />
+ <nd ref='-101481' />
+ <nd ref='-101483' />
+ <nd ref='-101485' />
+ <nd ref='-101487' />
+ <nd ref='-101489' />
+ <nd ref='-101491' />
+ <nd ref='-101493' />
+ <nd ref='-101495' />
+ <nd ref='-101497' />
+ <nd ref='-101499' />
+ <nd ref='-101501' />
+ <nd ref='-101503' />
+ <nd ref='-101505' />
+ <nd ref='-101507' />
+ <nd ref='-101509' />
+ <nd ref='-101511' />
+ <nd ref='-101513' />
+ <nd ref='-101515' />
+ <nd ref='-101517' />
+ <nd ref='-101519' />
+ <nd ref='-101521' />
+ <nd ref='-101523' />
+ <nd ref='-101525' />
+ <nd ref='-101527' />
+ <nd ref='-101529' />
+ <nd ref='-101531' />
+ <nd ref='-101533' />
+ <nd ref='-101535' />
+ <nd ref='-101537' />
+ <nd ref='-101539' />
+ <nd ref='-101541' />
+ <nd ref='-101543' />
+ <nd ref='-101545' />
+ <nd ref='-101547' />
+ <nd ref='-101549' />
+ <nd ref='-101551' />
+ <nd ref='-101553' />
+ <nd ref='-101555' />
+ <nd ref='-101557' />
+ <nd ref='-101559' />
+ <nd ref='-101561' />
+ <nd ref='-101563' />
+ <nd ref='-101565' />
+ <nd ref='-101567' />
+ <nd ref='-101569' />
+ <nd ref='-101571' />
+ <nd ref='-101573' />
+ <nd ref='-101575' />
+ <nd ref='-101577' />
+ <nd ref='-101579' />
+ <nd ref='-101581' />
+ <nd ref='-101583' />
+ <nd ref='-101585' />
+ <nd ref='-101587' />
+ <nd ref='-101589' />
+ <nd ref='-101591' />
+ <nd ref='-101593' />
+ <nd ref='-101595' />
+ <nd ref='-101597' />
+ <nd ref='-101599' />
+ <nd ref='-101601' />
+ <nd ref='-101603' />
+ <nd ref='-101605' />
+ <nd ref='-101607' />
+ <nd ref='-101609' />
+ <nd ref='-101611' />
+ <nd ref='-101613' />
+ <nd ref='-101615' />
+ <nd ref='-101617' />
+ <nd ref='-101619' />
+ <nd ref='-101621' />
+ <nd ref='-90626' />
+ <nd ref='-90628' />
+ <nd ref='-90630' />
+ <nd ref='-90632' />
+ <nd ref='-90634' />
+ <nd ref='-90636' />
+ <nd ref='-90638' />
+ <nd ref='-90640' />
+ <nd ref='-90642' />
+ <nd ref='-90644' />
+ <nd ref='-90646' />
+ <nd ref='-90648' />
+ <nd ref='-86405' />
+ <nd ref='-86407' />
+ <nd ref='-86409' />
+ <nd ref='-86411' />
+ <nd ref='-86413' />
+ <nd ref='-86415' />
+ <nd ref='-86417' />
+ <nd ref='-86419' />
+ <nd ref='-86421' />
+ <nd ref='-86423' />
+ <nd ref='-86425' />
+ <nd ref='-86427' />
+ <nd ref='-86429' />
+ <nd ref='-86431' />
+ <nd ref='-86433' />
+ <nd ref='-86435' />
+ <nd ref='-86437' />
+ <nd ref='-86439' />
+ <nd ref='-86441' />
+ <nd ref='-86443' />
+ <nd ref='-86445' />
+ <nd ref='-86447' />
+ <nd ref='-86449' />
+ <nd ref='-86451' />
+ <nd ref='-86453' />
+ <nd ref='-86455' />
+ <nd ref='-86457' />
+ <nd ref='-86459' />
+ <nd ref='-86461' />
+ <nd ref='-86463' />
+ <nd ref='-86465' />
+ <nd ref='-86467' />
+ <nd ref='-86469' />
+ <nd ref='-86471' />
+ <nd ref='-86473' />
+ <nd ref='-86475' />
+ <nd ref='-86477' />
+ <nd ref='-86479' />
+ <nd ref='-86481' />
+ <nd ref='-86483' />
+ <nd ref='-101340' />
+ <nd ref='-101342' />
+ <nd ref='-101344' />
+ <nd ref='-101346' />
+ <nd ref='-101348' />
+ <nd ref='-101350' />
+ <nd ref='-101352' />
+ <nd ref='-101354' />
+ <nd ref='-101356' />
+ <nd ref='-101358' />
+ <nd ref='-101360' />
+ <nd ref='-101362' />
+ <nd ref='-101364' />
+ <nd ref='-101366' />
+ <nd ref='-101368' />
+ <nd ref='-101372' />
+ <nd ref='-101374' />
+ <nd ref='-101376' />
+ <nd ref='-101378' />
+ <nd ref='-101380' />
+ <nd ref='-101382' />
+ <tag k='ISO3166-2' v='CN-13' />
+ <tag k='name:en' v='Hebei' />
+ </way>
+ <way id='-101711'>
+ <nd ref='-101433' />
+ <nd ref='-101619' />
+ <nd ref='-101617' />
+ <nd ref='-101615' />
+ <nd ref='-101613' />
+ <nd ref='-101611' />
+ <nd ref='-101609' />
+ <nd ref='-101607' />
+ <nd ref='-101605' />
+ <nd ref='-101603' />
+ <nd ref='-101601' />
+ <nd ref='-101599' />
+ <nd ref='-101597' />
+ <nd ref='-101595' />
+ <nd ref='-101593' />
+ <nd ref='-101591' />
+ <nd ref='-101589' />
+ <nd ref='-101587' />
+ <nd ref='-101585' />
+ <nd ref='-101583' />
+ <nd ref='-101581' />
+ <nd ref='-101731' />
+ <nd ref='-101733' />
+ <nd ref='-101735' />
+ <nd ref='-101737' />
+ <nd ref='-101739' />
+ <nd ref='-101741' />
+ <nd ref='-101743' />
+ <nd ref='-101745' />
+ <nd ref='-101747' />
+ <nd ref='-101471' />
+ <nd ref='-101469' />
+ <nd ref='-101467' />
+ <nd ref='-101465' />
+ <nd ref='-101463' />
+ <nd ref='-101461' />
+ <nd ref='-101459' />
+ <nd ref='-101457' />
+ <nd ref='-101455' />
+ <nd ref='-101453' />
+ <nd ref='-101451' />
+ <nd ref='-101449' />
+ <nd ref='-101447' />
+ <nd ref='-101445' />
+ <nd ref='-101443' />
+ <nd ref='-101441' />
+ <nd ref='-101439' />
+ <nd ref='-101437' />
+ <nd ref='-101435' />
+ <nd ref='-101433' />
+ <tag k='ISO3166-2' v='CN-12' />
+ <tag k='name:en' v='Tianjin' />
+ </way>
+ <way id='-101781'>
+ <nd ref='-101731' />
+ <nd ref='-101733' />
+ <nd ref='-101735' />
+ <nd ref='-101737' />
+ <nd ref='-101739' />
+ <nd ref='-101741' />
+ <nd ref='-101743' />
+ <nd ref='-101745' />
+ <nd ref='-101747' />
+ <nd ref='-101471' />
+ <nd ref='-101473' />
+ <nd ref='-101475' />
+ <nd ref='-101477' />
+ <nd ref='-101479' />
+ <nd ref='-101481' />
+ <nd ref='-101483' />
+ <nd ref='-101485' />
+ <nd ref='-101487' />
+ <nd ref='-101489' />
+ <nd ref='-101491' />
+ <nd ref='-101493' />
+ <nd ref='-101495' />
+ <nd ref='-101497' />
+ <nd ref='-101499' />
+ <nd ref='-101501' />
+ <nd ref='-101503' />
+ <nd ref='-101505' />
+ <nd ref='-101507' />
+ <nd ref='-101509' />
+ <nd ref='-101511' />
+ <nd ref='-101513' />
+ <nd ref='-101515' />
+ <nd ref='-101517' />
+ <nd ref='-101519' />
+ <nd ref='-101521' />
+ <nd ref='-101523' />
+ <nd ref='-101525' />
+ <nd ref='-101527' />
+ <nd ref='-101529' />
+ <nd ref='-101531' />
+ <nd ref='-101533' />
+ <nd ref='-101535' />
+ <nd ref='-101537' />
+ <nd ref='-101539' />
+ <nd ref='-101541' />
+ <nd ref='-101543' />
+ <nd ref='-101545' />
+ <nd ref='-101547' />
+ <nd ref='-101549' />
+ <nd ref='-101551' />
+ <nd ref='-101553' />
+ <nd ref='-101555' />
+ <nd ref='-101557' />
+ <nd ref='-101559' />
+ <nd ref='-101561' />
+ <nd ref='-101563' />
+ <nd ref='-101565' />
+ <nd ref='-101567' />
+ <nd ref='-101569' />
+ <nd ref='-101571' />
+ <nd ref='-101573' />
+ <nd ref='-101575' />
+ <nd ref='-101577' />
+ <nd ref='-101579' />
+ <nd ref='-101581' />
+ <nd ref='-101731' />
+ <tag k='ISO3166-2' v='CN-11' />
+ <tag k='name:en' v='Beijing' />
+ </way>
<relation id='-29600'>
<member type='way' ref='-28916' role='outer' />
<member type='way' ref='-28918' role='outer' />
@@ -47647,4 +58702,21 @@
<tag k='name:en' v='Musandam' />
<tag k='type' v='multipolygon' />
</relation>
+ <relation id='-92264'>
+ <member type='way' ref='-92256' role='outer' />
+ <member type='way' ref='-92247' role='outer' />
+ <member type='way' ref='-92272' role='outer' />
+ <member type='way' ref='-92284' role='outer' />
+ <tag k='ISO3166-2' v='IN-PY' />
+ <tag k='name:en' v='Puducherry' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-99745'>
+ <member type='way' ref='-99452' role='outer' />
+ <member type='way' ref='-29370' role='inner' />
+ <member type='way' ref='-29384' role='inner' />
+ <tag k='ISO3166-2' v='CN-44' />
+ <tag k='name:en' v='Guangdong' />
+ <tag k='type' v='multipolygon' />
+ </relation>
</osm>
diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index cde7afd..caa9c1f 100644
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -294,6 +294,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:power=generator"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:power=generator"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=generator"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:power=generator"
@@ -1316,6 +1317,7 @@
<item name="Stop" icon="presets/vehicle/restriction/stop.svg" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stop"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=stop"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=stop"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=stop"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=stop"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=stop"
@@ -1698,6 +1700,7 @@
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=cattle_grid"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=cattle_grid"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=cattle_grid"
+ pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:barrier=cattle_grid"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=cattle_grid" />
<key key="barrier" value="cattle_grid" />
<reference ref="barrier_4" />
@@ -6607,7 +6610,8 @@
<group name="Motorsport" icon="presets/vehicle/motorbike.svg">
<item name="Motorsport" icon="presets/sport/motor.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=motor"
- de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=motor" />
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=motor"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:sport=motor" />
<space />
<key key="sport" value="motor" />
<text key="name" text="Name" />
@@ -6901,6 +6905,7 @@
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=mineshaft"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=mineshaft"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=mineshaft"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:man_made=mineshaft"
pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:man_made=mineshaft"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=mineshaft" />
<space />
@@ -7085,6 +7090,7 @@
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=beacon"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=beacon"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=beacon"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:man_made=beacon"
pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:man_made=beacon"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=beacon" />
<space />
@@ -8218,6 +8224,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=shoes"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=shoes"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=shoes"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=shoes"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=shoes"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=shoes"
pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=shoes"
@@ -8802,6 +8809,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=jewelry"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=jewelry"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=jewelry"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=jewelry"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=jewelry"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=jewelry"
pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=jewelry"
@@ -9208,6 +9216,7 @@
<item name="Private company" icon="presets/office/private_company.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:office=company"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:office=company"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:office=company"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:office=company"
pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:office=company"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:office=company"
@@ -9556,6 +9565,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:craft=tiler"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:craft=tiler"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:craft=tiler"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:craft=tiler"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:craft=tiler"
pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:craft=tiler" />
<space />
@@ -10785,6 +10795,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=landfill"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=landfill"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=landfill"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:landuse=landfill"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=landfill"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=landfill"
pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:landuse=landfill"
diff --git a/data/validator/combinations.mapcss b/data/validator/combinations.mapcss
index ac89ac1..57016be 100644
--- a/data/validator/combinations.mapcss
+++ b/data/validator/combinations.mapcss
@@ -307,7 +307,7 @@ way[highway=footway][cycleway=lane] {
*[bridge ][!highway][!railway][!waterway][!piste:type][public_transport != platform][man_made !~ /^(bridge|pipeline)$/][building != bridge],
*[psv ][!highway][!railway][!waterway][amenity !~ /^parking.*/],
*[width ][!highway][!railway][!waterway][!aeroway][!cycleway][!footway][!barrier][!man_made][!entrance][natural!=stone],
-*[maxspeed][!highway][!railway][traffic_sign !~ /^((.*;)?maxspeed(;.*)?|[A-Z][A-Z]:.+)$/][type != enforcement][waterway !~ /^(river|canal|lock)$/][!traffic_calming] {
+*[maxspeed][!highway][!railway][traffic_sign !~ /^((.*;)?maxspeed(;.*)?|[A-Z][A-Z]:.+)$/][type != enforcement][waterway !~ /^(river|canal|lock)$/][!traffic_calming][aerialway!=zip_line] {
throwWarning: tr("{0} on suspicious object", "{0.key}");
group: tr("suspicious tag combination");
}
diff --git a/data/validator/ignoretags.cfg b/data/validator/ignoretags.cfg
index 23aa73d..75faec2 100644
--- a/data/validator/ignoretags.cfg
+++ b/data/validator/ignoretags.cfg
@@ -157,6 +157,8 @@ K:building=bunker
K:building=civic
K:building=houseboat
K:building=static_caravan
+K:building=semi
+K:building=semidetached_house
K:leisure=recreation_ground
K:old_railway_operator=PRR
K:maintenance=gritting
diff --git a/data/validator/numeric.mapcss b/data/validator/numeric.mapcss
index 2d5d1d6..81339ee 100644
--- a/data/validator/numeric.mapcss
+++ b/data/validator/numeric.mapcss
@@ -198,18 +198,32 @@ way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
assertNoMatch: "node admin_level=5";
}
-*[direction][direction>=0][direction<360] {
- set correct_direction_degree;
-}
-*[direction][direction !~ /^(north|east|south|west|N|E|S|W|NE|SE|SW|NW|NNE|ENE|ESE|SSE|SSW|WSW|WNW|NNW|forward|backward|both|clockwise|anti-clockwise|anticlockwise|up|down)$/]!.correct_direction_degree {
+/* #14989 */
+*[direction][direction<0],
+*[direction][direction>=360] {
throwWarning: tr("unusual value of {0}", "{1.key}");
- assertMatch: "node direction=360";
assertMatch: "node direction=-10";
- assertMatch: "node direction=north-east";
+ assertMatch: "node direction=360";
+ assertNoMatch: "node direction=0";
+}
+*[direction][direction !~ /^([0-9][0-9]?[0-9]?|north|east|south|west|N|E|S|W|NE|SE|SW|NW|NNE|ENE|ESE|SSE|SSW|WSW|WNW|NNW|forward|backward|both|clockwise|anti-clockwise|anticlockwise|up|down)(-([0-9][0-9]?[0-9]?|N|E|S|W|NE|SE|SW|NW|NNE|ENE|ESE|SSE|SSW|WSW|WNW|NNW))?(;([0-9][0-9]?[0-9]?|N|E|S|W|NE|SE|SW|NW|NNE|ENE|ESE|SSE|SSW|WSW|WNW|NNW)-([0-9][0-9]?[0-9]?|N|E|S|W|NE|SE|SW|NW|NNE|ENE|ESE|SSE|SSW|WSW|WNW|NNW))*$/] {
+ throwWarning: tr("unusual value of {0}", "{1.key}");
+ assertMatch: "node direction=north-down";
+ assertMatch: "node direction=rome";
+ assertMatch: "node direction=C";
+ assertMatch: "node direction=NNNE";
+ assertMatch: "node direction=1360";
+ assertNoMatch: "node direction=NE-S"; /* ranges are used at tourism=viewpoint*/
+ assertMatch: "node direction=north-south"; /* ranges only in numbers or short NESW form */
+ assertMatch: "node direction=north-east"; /* if range use N-E, if single direcion use NE */
+ assertNoMatch: "node direction=0-360"; /* complete panorama view */
+ assertNoMatch: "node direction=45-100;190-250;300-360";
+ assertMatch: "node direction=45-100;190-250;300";
assertNoMatch: "node direction=up";
assertNoMatch: "node direction=down"; /* up/down are replaced by incline tag, has separate warning */
assertNoMatch: "node direction=0";
assertNoMatch: "node direction=45";
+ assertNoMatch: "node direction=360";
assertNoMatch: "node direction=N";
assertNoMatch: "node direction=NNE";
assertNoMatch: "node direction=west";
diff --git a/eclipse/JOSM (Java 8).launch b/eclipse/JOSM (Java 8).launch
index 2b399b3..b5d7433 100644
--- a/eclipse/JOSM (Java 8).launch
+++ b/eclipse/JOSM (Java 8).launch
@@ -7,7 +7,7 @@
<listEntry value="1"/>
</listAttribute>
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<sourceLookupDirector>
<sourceContainers duplicates="false">
<container memento="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <javaProject name="JOSM-DXFImpo [...]
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<sourceLookupDirector>
<sourceContainers duplicates="false">
<container memento="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <javaProject name="JOSM-DXFImpo [...]
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--debug"/>
diff --git a/i18n/po/af.po b/i18n/po/af.po
index b8c2bf0..c1e1557 100644
--- a/i18n/po/af.po
+++ b/i18n/po/af.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2011-10-13 02:39+0000\n"
"Last-Translator: Grant Slater <Unknown>\n"
"Language-Team: Afrikaans <af at 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-07-03 04:33+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:33+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: af\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2403,6 +2403,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2499,6 +2502,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2676,6 +2685,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7839,6 +7851,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7875,6 +7890,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13251,6 +13269,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14843,9 +14864,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14985,10 +15018,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15405,10 +15555,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15834,6 +15984,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27747,7 +27909,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27774,7 +27936,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27877,6 +28042,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31766,6 +31937,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31812,6 +31991,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31831,6 +32016,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31845,7 +32033,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33049,6 +33250,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33073,6 +33277,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/am.po b/i18n/po/am.po
index 99aa110..38dede0 100644
--- a/i18n/po/am.po
+++ b/i18n/po/am.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2010-03-30 12:09+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Amharic <am at 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-07-03 04:34+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:34+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: am\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2403,6 +2403,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2499,6 +2502,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2676,6 +2685,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7839,6 +7851,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7875,6 +7890,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13251,6 +13269,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14843,9 +14864,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14985,10 +15018,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15405,10 +15555,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15834,6 +15984,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27747,7 +27909,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27774,7 +27936,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27877,6 +28042,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31766,6 +31937,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31812,6 +31991,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31831,6 +32016,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31845,7 +32033,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33049,6 +33250,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33073,6 +33277,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/ar.po b/i18n/po/ar.po
index a61f715..a19d78f 100644
--- a/i18n/po/ar.po
+++ b/i18n/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2017-06-05 02:55+0000\n"
"Last-Translator: Chdoula <chdoula at gmail.com>\n"
"Language-Team: Arabic <ar at 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-07-03 04:34+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:34+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: ar\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2421,6 +2421,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2517,6 +2520,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2694,6 +2703,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7877,6 +7889,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7913,6 +7928,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "خ. العرض الأدنى"
@@ -13302,6 +13320,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14894,9 +14915,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -15036,10 +15069,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15456,10 +15606,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15885,6 +16035,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27798,7 +27960,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27825,7 +27987,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27928,6 +28093,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31817,6 +31988,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31863,6 +32042,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31882,6 +32067,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31896,7 +32084,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33100,6 +33301,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33124,6 +33328,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/ast.po b/i18n/po/ast.po
index 82014f1..bb009d1 100644
--- a/i18n/po/ast.po
+++ b/i18n/po/ast.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
-"PO-Revision-Date: 2017-07-02 01:18+0000\n"
-"Last-Translator: Xuacu Saturio <xuacusk8 at gmail.com>\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
+"PO-Revision-Date: 2017-07-04 07:51+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Asturian <ast at li.org>\n"
"MIME-Version: 1.0\n"
"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-07-03 04:35+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:35+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: ast\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2602,6 +2602,9 @@ msgstr "Sintaxis de gueta"
msgid "Invalid search expression"
msgstr "Espresión de gueta non válida"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Peñera"
@@ -2706,6 +2709,12 @@ msgstr "toles víes zarraes"
msgid "object without useful tags"
msgstr "oxetos ensin etiquetes útiles"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "metadatu"
@@ -2903,6 +2912,9 @@ msgstr "Enteru positivu esperáu"
msgid "Range of numbers expected"
msgstr "S''esperaba un rangu de númberos"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Elementu ensin esperar. Esperábase {0} pero atopóse {1}"
@@ -3967,7 +3979,7 @@ msgid "Double Stereographic"
msgstr "Doble Estereográficu"
msgid "Lambert Azimuthal Equal Area"
-msgstr "Lambert Azimutal d'Árees Iguales"
+msgstr "Lambert Azimutal d’Árees Iguales"
msgid "Lambert Conformal Conic"
msgstr "Cónica Conforme de Lambert"
@@ -4056,7 +4068,7 @@ msgid "URL contains an invalid fragment: {0}"
msgstr "La URL contien un fragmentu inválidu: {0}"
msgid "URL validator"
-msgstr "Validador d'URL"
+msgstr "Validador d’URL"
msgid "Addresses"
msgstr "Direiciones"
@@ -4385,7 +4397,7 @@ msgid ""
"With the currently used mappaint style(s) the style for outer way mismatches "
"the area style"
msgstr ""
-"Colos estilos de MapPoint utilizaos actualmente, l'estilu de la vía esterna "
+"Colos estilos de MapPoint utilizaos actualmente, l’estilu de la vía esterna "
"nun casa col estilu del área"
msgid "Area style on outer way"
@@ -4410,7 +4422,7 @@ msgid "Multipolygon inner way is outside"
msgstr "vía interna del multipolígonu tá fora"
msgid "Multipolygon ring contains segments twice"
-msgstr "L'aniellu del multipolígonu contien segmentos dos veces"
+msgstr "L’aniellu del multipolígonu contien segmentos dos veces"
msgid "Multipolygon outer way shares segment(s) with other ring"
msgstr ""
@@ -8499,6 +8511,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Númberu d''argumentos erróneos pal marcador"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Erru al lleer la entrá del marcador: %s"
@@ -8539,6 +8554,9 @@ msgstr "Esaniciar los marcadores anguaño escoyíos"
msgid "Rename the currently selected bookmark"
msgstr "Reñomar el marcador anguaño escoyíu"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "llat. mín."
@@ -14569,6 +14587,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Lleendo información del usuariu ..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Empezando a xubir nun únicu pidimientu por primitiva..."
@@ -16411,9 +16432,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -16553,10 +16586,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -16973,10 +17123,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -17405,6 +17555,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
@@ -29649,8 +29811,8 @@ msgstr ""
msgid "Name:"
msgstr "Nome:"
-msgid "updated building info"
-msgstr "información del edificiu actualizada"
+msgid "update building info"
+msgstr ""
msgid "Tag Element"
msgstr "Etiquetar Elementu"
@@ -29676,8 +29838,11 @@ msgstr "Selector d''Área"
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
-msgstr "Área creada"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
+msgstr ""
msgid "Add address"
msgid_plural "Add addresses"
@@ -29782,6 +29947,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -33935,6 +34106,14 @@ msgstr "La imprentación falló."
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -33981,6 +34160,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -34000,6 +34185,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -34014,7 +34202,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -35270,6 +35471,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -35294,6 +35498,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/az.po b/i18n/po/az.po
index 47b970c..e8c8154 100644
--- a/i18n/po/az.po
+++ b/i18n/po/az.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2016-12-17 13:38+0000\n"
"Last-Translator: iAZISS <iss-sash at mail.ru>\n"
"Language-Team: Azerbaijani <az at 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-07-03 04:35+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:36+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -2402,6 +2402,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2498,6 +2501,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2675,6 +2684,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7838,6 +7850,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7874,6 +7889,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13250,6 +13268,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14842,9 +14863,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14984,10 +15017,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15404,10 +15554,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15833,6 +15983,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27746,7 +27908,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27773,7 +27935,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27876,6 +28041,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31765,6 +31936,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31811,6 +31990,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31830,6 +32015,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31844,7 +32032,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33048,6 +33249,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33072,6 +33276,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/be.po b/i18n/po/be.po
index 127bfaa..e2d779d 100644
--- a/i18n/po/be.po
+++ b/i18n/po/be.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2017-02-19 15:59+0000\n"
"Last-Translator: Darafei Praliaskouski <komzpa at gmail.com>\n"
"Language-Team: Belarusian <i18n at 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: 2017-07-03 04:36+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:36+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: be\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2636,6 +2636,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Няправільны выраз для пошуку"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Фільтар"
@@ -2739,6 +2742,12 @@ msgstr "усе замкнёныя лініі"
msgid "object without useful tags"
msgstr "аб’ект без значных тэгаў"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "метададзеныя"
@@ -2931,6 +2940,9 @@ msgstr "Чакаўся дадатны цэлы лік"
msgid "Range of numbers expected"
msgstr "Чакалася паслядоўнасць лікаў"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Нечаканы маркер. Чакалася {0}, знойдзена {1}"
@@ -8562,6 +8574,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Няслушная колькасць аргументаў для закладкі"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Памылка чытання запісу ў закладцы: %s"
@@ -8604,6 +8619,9 @@ msgstr "Выдаліць вылучаныя закладкі"
msgid "Rename the currently selected bookmark"
msgstr "Пераназваць вылучаныя закладкі"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "мін. шырата"
@@ -14643,6 +14661,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Чытанне інфармацыі пра карыстальніка ..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Пачатак перадачы на сервер з асобным запытам на кожны элемент ..."
@@ -16552,9 +16573,21 @@ msgstr "Спадарожнікавыя здымкі Mapbox"
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -16695,11 +16728,128 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
-msgstr "IGN Аргентына (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
-msgid "IGN Argentina (WMS)"
-msgstr "IGN Аргенціна (WMS)"
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
+msgstr ""
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI чорна-белая 2.5м"
@@ -17115,11 +17265,11 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
-msgstr "Данія: адмыўка рэльефу SDFE (40 см)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
+msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
-msgstr "Данія: адмыўка паверхні SDFE (40 см)"
+msgid "SDFE Surface Shadow Map (40 cm)"
+msgstr ""
msgid "SDFE Skærmkort"
msgstr ""
@@ -17552,6 +17702,18 @@ msgstr "OSMIE - выбарчыя акругі Палаты прадстаўні
msgid "OSMIE T.ie Land not in Counties"
msgstr "OSMIE: землі па-за графствамі"
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr "Лодзі - Італія"
@@ -29853,8 +30015,8 @@ msgstr ""
msgid "Name:"
msgstr "Назва:"
-msgid "updated building info"
-msgstr "абноўлена інфармацыя пра будынак"
+msgid "update building info"
+msgstr ""
msgid "Tag Element"
msgstr "Задаць тэгі элемента"
@@ -29882,8 +30044,11 @@ msgstr "Вылучэнне ўчастка"
msgid "Trying to detect an area at:"
msgstr "Спроба распазнаць вобласць у пункце:"
-msgid "Created area"
-msgstr "Створана вобласць"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
+msgstr ""
msgid "Add address"
msgid_plural "Add addresses"
@@ -30000,6 +30165,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr "Адладка"
@@ -34140,6 +34311,14 @@ msgstr "Збой друку."
msgid "Repeat last fix"
msgstr "Паўтарыць апошняе выпраўленне"
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -34192,6 +34371,12 @@ msgstr "Што вы выбераце для працягу?"
msgid "PT_Assistant Proceed Request"
msgstr "Запыт наступнага дзеяння PT_Assistant"
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr "ГТ: месца прыпынку не ўваходзіць у склад дарогі"
@@ -34213,6 +34398,9 @@ msgstr ""
"Правярае сумяшчальнасць дачыненняў маршрутаў з 2-й версіяй маршрутаў "
"грамадскага транспарта"
+msgid "PT: Relation member roles do not match tags"
+msgstr "ГТ: Ролі ўдзельніка дачынення не адпавядаюць тэгам"
+
msgid "Fix error"
msgstr "Выправіць памылку"
@@ -34227,8 +34415,21 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
-msgstr "ГТ: Ролі ўдзельніка дачынення не адпавядаюць тэгам"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
+msgstr ""
msgid "PT: Route should start and end with a stop_position"
msgstr "ГТ: Маршрут павінен пачынацца і сканчацца stop_position"
@@ -35478,6 +35679,9 @@ msgstr "Уключыць модуль Tofix"
msgid "Auto delete layer"
msgstr "Аўтаматычнае выдаленне пласта"
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr "Адзначце патрэбныя опцыі:"
@@ -35502,6 +35706,15 @@ msgstr "<html><a href=\"\">Спіс заданняў</a></html>"
msgid "Select a task ..."
msgstr "Выберыце заданне..."
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr "Задайце вобласць запампоўкі (м²)"
@@ -37531,3 +37744,9 @@ msgstr "Прыступіць да кіравання"
msgid "Drive a race car on this layer"
msgstr "Весці гоначны аўтамабіль на гэтым пласце"
+
+#~ msgid "SDFE Terræn Skyggekort (40 cm)"
+#~ msgstr "Данія: адмыўка рэльефу SDFE (40 см)"
+
+#~ msgid "SDFE Overflade Skyggekort (40 cm)"
+#~ msgstr "Данія: адмыўка паверхні SDFE (40 см)"
diff --git a/i18n/po/bg.po b/i18n/po/bg.po
index ea591ed..c86f48e 100644
--- a/i18n/po/bg.po
+++ b/i18n/po/bg.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
-"PO-Revision-Date: 2017-05-03 05:56+0000\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
+"PO-Revision-Date: 2017-07-15 21:07+0000\n"
"Last-Translator: pl <Unknown>\n"
"Language-Team: Bulgarian <bg at li.org>\n"
"MIME-Version: 1.0\n"
"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-07-03 04:38+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:38+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: bg\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1676,7 +1676,7 @@ msgid "Upload note changes to server"
msgstr ""
msgid "Upload notes"
-msgstr "Качване на точки"
+msgstr "Качване на бележки"
msgid "Uploading notes to server"
msgstr "Качване на бележките на сървъра"
@@ -2509,6 +2509,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Невалиден израз за търсен"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Филтър"
@@ -2608,6 +2611,12 @@ msgstr "всички затворени пътища"
msgid "object without useful tags"
msgstr "обект без полезени тагове"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "мета-данни"
@@ -2794,6 +2803,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7996,6 +8008,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -8032,6 +8047,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "мин. ширина"
@@ -9422,14 +9440,14 @@ msgstr "Запис на слой"
msgid "{0} note"
msgid_plural "{0} notes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} бележка"
+msgstr[1] "{0} бележки"
msgid "Notes layer"
-msgstr ""
+msgstr "Слой за бележки"
msgid "Total notes:"
-msgstr ""
+msgstr "Всичко бележки:"
msgid "Changes need uploading?"
msgstr ""
@@ -13514,6 +13532,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -15122,9 +15143,21 @@ msgstr "Mapbox Satellite"
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -15264,10 +15297,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15684,10 +15834,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -16115,6 +16265,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
@@ -21969,7 +22131,7 @@ msgstr "Монети"
msgctxt "payment"
msgid "Notes"
-msgstr "Бележки"
+msgstr "Банкноти"
msgid "Telephone cards"
msgstr "Телефонни карти"
@@ -28047,7 +28209,7 @@ msgstr ""
msgid "Name:"
msgstr "Име:"
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -28074,7 +28236,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -28177,6 +28342,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -32114,6 +32285,14 @@ msgstr "Принтирането се провали"
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -32160,6 +32339,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -32179,6 +32364,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -32193,7 +32381,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33402,6 +33603,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33426,6 +33630,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/bn.po b/i18n/po/bn.po
index 949ab60..c89431f 100644
--- a/i18n/po/bn.po
+++ b/i18n/po/bn.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2015-04-03 09:24+0000\n"
"Last-Translator: Md Alamgir <alamgircu at hotmail.com>\n"
"Language-Team: Bengali <bn at 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-07-03 04:37+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:37+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: bn\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2406,6 +2406,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2502,6 +2505,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2679,6 +2688,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7842,6 +7854,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7878,6 +7893,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13254,6 +13272,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14846,9 +14867,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14988,10 +15021,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15408,10 +15558,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15837,6 +15987,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27750,7 +27912,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27777,7 +27939,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27880,6 +28045,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31769,6 +31940,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31815,6 +31994,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31834,6 +32019,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31848,7 +32036,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33052,6 +33253,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33076,6 +33280,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/br.po b/i18n/po/br.po
index 3945ea5..58864a0 100644
--- a/i18n/po/br.po
+++ b/i18n/po/br.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2011-10-17 12:11+0000\n"
"Last-Translator: Fulup <Unknown>\n"
"Language-Team: Breton <br at 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-07-03 04:37+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:38+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: br\n"
msgid "License"
@@ -2403,6 +2403,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2499,6 +2502,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2676,6 +2685,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7839,6 +7851,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7875,6 +7890,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13251,6 +13269,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14843,9 +14864,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14985,10 +15018,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15405,10 +15555,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15834,6 +15984,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27747,7 +27909,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27774,7 +27936,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27877,6 +28042,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31766,6 +31937,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31812,6 +31991,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31831,6 +32016,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31845,7 +32033,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33049,6 +33250,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33073,6 +33277,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/bs.po b/i18n/po/bs.po
index cec1da4..1202c61 100644
--- a/i18n/po/bs.po
+++ b/i18n/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2012-11-03 23:07+0000\n"
"Last-Translator: Alen Mahovic <eyeofthestorm at windowslive.com>\n"
"Language-Team: Bosnian <bs at 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: 2017-07-03 04:37+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:37+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: bs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2406,6 +2406,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2502,6 +2505,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2679,6 +2688,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7842,6 +7854,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7878,6 +7893,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13254,6 +13272,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14846,9 +14867,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14988,10 +15021,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15408,10 +15558,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15837,6 +15987,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27750,7 +27912,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27777,7 +27939,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27880,6 +28045,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31769,6 +31940,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31815,6 +31994,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31834,6 +32019,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31848,7 +32036,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33052,6 +33253,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33076,6 +33280,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/ca.po b/i18n/po/ca.po
index f2b167b..113cc6a 100644
--- a/i18n/po/ca.po
+++ b/i18n/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2017-03-14 22:52+0000\n"
"Last-Translator: Don-vip <Unknown>\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: 2017-07-03 04:38+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:39+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: ca\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2625,6 +2625,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "L''expressió de cerca no és vàlida"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Filtre"
@@ -2728,6 +2731,12 @@ msgstr "totes les vies tancades"
msgid "object without useful tags"
msgstr "objecte sense dades útils"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "metadada"
@@ -2920,6 +2929,9 @@ msgstr "S''esperava un nombre enter positiu"
msgid "Range of numbers expected"
msgstr "Sèrie de nombres esperats"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Testimoni inesperat. Esperat {0}, trobat {1}"
@@ -8562,6 +8574,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "El nombre d''aruments no és correcte pel favorit"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Error llegint entrada de favorits: %s"
@@ -8602,6 +8617,9 @@ msgstr "Suprimir els marcadors seleccionats"
msgid "Rename the currently selected bookmark"
msgstr "Canvia el nom al marcador seleccionat"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "lat min"
@@ -14656,6 +14674,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Llegint informació de l''usuari ..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Començant a pujar amb una petició per objecte ..."
@@ -16521,9 +16542,21 @@ msgstr "Mapbox Satèl·lit"
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -16663,10 +16696,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -17083,10 +17233,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -17515,6 +17665,18 @@ msgstr "OSMIE Dail Election Areas"
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr "Lodi - Itàlia"
@@ -29798,8 +29960,8 @@ msgstr ""
msgid "Name:"
msgstr "Nom:"
-msgid "updated building info"
-msgstr "informació de l''edifici actualitzada"
+msgid "update building info"
+msgstr ""
msgid "Tag Element"
msgstr "Etiqueta element"
@@ -29825,8 +29987,11 @@ msgstr "Selector d''àrea"
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
-msgstr "Àrea creada"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
+msgstr ""
msgid "Add address"
msgid_plural "Add addresses"
@@ -29943,6 +30108,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr "Depura"
@@ -34139,6 +34310,14 @@ msgstr "La impressió ha fallat"
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -34185,6 +34364,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -34204,6 +34389,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -34218,7 +34406,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -35479,6 +35680,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -35503,6 +35707,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr "Selecciona l''àrea a baixar (m²)"
diff --git a/i18n/po/ca at valencia.po b/i18n/po/ca at valencia.po
index 3c1ef37..ed72567 100644
--- a/i18n/po/ca at valencia.po
+++ b/i18n/po/ca at valencia.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2015-04-25 18:52+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at 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: 2017-07-03 05:08+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:10+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: ca at valencia\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2592,6 +2592,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "L''expressió de cerca no és vàlida"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Filtre"
@@ -2694,6 +2697,12 @@ msgstr "totes les vies tancades"
msgid "object without useful tags"
msgstr "objecte sense dades útils"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "metadada"
@@ -2883,6 +2892,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr "Sèrie de nombres esperats"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Testimoni inesperat. Esperat {0}, trobat {1}"
@@ -8395,6 +8407,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr "El nombre d''aruments no és correcte pel favorit"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Error llegint entrada de favorits: %s"
@@ -8435,6 +8450,9 @@ msgstr "Suprimir els marcadors seleccionats"
msgid "Rename the currently selected bookmark"
msgstr "Canvia el nom al marcador seleccionat"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "lat min"
@@ -14467,6 +14485,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Llegint informació de l''usuari ..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Començant a pujar amb una petició per objecte ..."
@@ -16313,9 +16334,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -16455,10 +16488,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -16875,10 +17025,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -17304,6 +17454,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -29468,7 +29630,7 @@ msgstr ""
msgid "Name:"
msgstr "Nom:"
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -29495,7 +29657,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -29598,6 +29763,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -33774,6 +33945,14 @@ msgstr "La impressió ha fallat"
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -33820,6 +33999,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -33839,6 +34024,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -33853,7 +34041,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -35113,6 +35314,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -35137,6 +35341,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/cs.po b/i18n/po/cs.po
index 02e34f1..ab8fd7f 100644
--- a/i18n/po/cs.po
+++ b/i18n/po/cs.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
-"PO-Revision-Date: 2017-06-29 12:12+0000\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
+"PO-Revision-Date: 2017-07-28 04:32+0000\n"
"Last-Translator: Dalibor Jelínek <launchpad.net at dalibor.cz>\n"
"Language-Team: Czech <kde-i18n-doc at kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-07-03 04:39+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:39+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: cs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2616,6 +2616,9 @@ msgstr "Syntaxe vyhledávání"
msgid "Invalid search expression"
msgstr "Neplatný vyhledávaný výraz"
+msgid "Search by preset"
+msgstr "Hledat podle předvolby"
+
msgid "Filter"
msgstr "Filtr"
@@ -2720,6 +2723,14 @@ msgstr "všechny uzavřené cesty"
msgid "object without useful tags"
msgstr "objekt bez užitečných značek"
+msgid "all objects that use the address preset"
+msgstr "všechny objekty, které používají předvolbu adresy"
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+"všechny objekty, které používají libovolnou předvolbu ze skupiny "
+"Geografie/Příroda"
+
msgid "metadata"
msgstr "Metadata"
@@ -2910,6 +2921,9 @@ msgstr "Očekáváno celé kladné číslo"
msgid "Range of numbers expected"
msgstr "Očekáván číselný rozsah"
+msgid "Unknown preset name: "
+msgstr "Neznámý název předvolby: "
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Neočekávaný token. Očekáváno {0}, nalezeno {1}"
@@ -8490,6 +8504,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Nesprávný počet argumentů pro záložku"
+msgid "Home location"
+msgstr "Domovské místo"
+
msgid "Error reading bookmark entry: %s"
msgstr "Chyba při čtení záložky: %s"
@@ -8530,6 +8547,9 @@ msgstr "Odstranit vybrané záložky"
msgid "Rename the currently selected bookmark"
msgstr "Přejmenovat vybranou záložku"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr "Stáhnout záložky mých {0} posledních sad změn"
+
msgid "min lat"
msgstr "min šířka"
@@ -14510,6 +14530,9 @@ msgstr "Neplatná hodnota atributu ''{0}'' XML značky ''{1}''. Nalezeno {2}."
msgid "Reading user info ..."
msgstr "Získávám informace o uživateli ..."
+msgid "Reading user preferences ..."
+msgstr "Čtení uživatelských převoleb..."
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Začínám nahrávat na server s jedním požadavkem na každý prvek ..."
@@ -16398,9 +16421,27 @@ msgstr "Mapbox Satellite"
msgid "DigitalGlobe Premium Imagery"
msgstr "Prvotřídní snímky DigitalGlobe"
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+"DigitalGlobe-Premium je mozaika složená ze základní mapy DigitalGlobe s "
+"vybranými oblastmi vyplněnými +Vivid, rozlišení 50 cm nebo lepší, častěji "
+"občerstvováno průběžnými aktualizacemi."
+
msgid "DigitalGlobe Standard Imagery"
msgstr "Standardní snímky DigitalGlobe"
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+"DigitalGlobe-Standard je vybraná sada snímků pokrývajících 86% povrchu "
+"pevnin Země, o rozlišení 30 - 60 cm doplněná snímky Landsat. Průměrné stáří "
+"je 2,31 roku a některé oblasti jsou aktualizovány dvakrát ročně."
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -16545,11 +16586,128 @@ msgstr "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr "Snímky Sentinel-2 oblasti Enderby Land a Kemp Coast (pravé barvy)"
-msgid "IGN Argentina (TMS)"
-msgstr "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr "IGN topographical map (TMS)"
+
+msgid "IGN topographical map (WMS)"
+msgstr "IGN topographical map (WMS)"
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr "IGN orthophoto AMBA a (WMTS)"
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr "IGN orthophoto AMBA b (WMTS)"
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr "IGN orthophoto AMBA c (WMTS)"
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr "IGN orthophoto AMBA d (WMTS)"
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr "IGN orthophoto AMBA e (WMTS)"
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr "IGN orthophoto AMBA f (WMTS)"
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr "IGN orthophoto AMBA 4 (WMTS)"
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr "IGN orthophoto AMBA 5 (WMTS)"
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr "IGN orthophoto AMBA 6 (WMTS)"
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr "IGN orthophoto AMBA 7 (WMTS)"
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr "IGN orthophoto Barranqueras (WMTS)"
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr "IGN orthophoto Catamarca (WMTS)"
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr "IGN orthophoto Córdoba (WMTS)"
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr "IGN orthophoto El Calafate (WMTS)"
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr "IGN orthophoto El Rodeo (WMTS)"
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr "IGN orthophoto Jujuy (WMTS)"
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr "IGN orthophoto La Rioja (WMTS)"
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr "IGN orthophoto Mendoza (WMTS)"
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr "IGN orthophoto Neuquén (WMTS)"
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr "IGN orthophoto Posadas (WMTS)"
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr "IGN orthophoto Resistencia (WMTS)"
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr "IGN orthophoto Río Gallegos (WMTS)"
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr "IGN orthophoto Río Grande (WMTS)"
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr "IGN orthophoto Río Paraná A (WMTS)"
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr "IGN orthophoto Río Paraná B (WMTS)"
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr "IGN orthophoto Rosario (WMTS)"
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr "IGN orthophoto Salto Grande (WMTS)"
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr "IGN orthophoto San Juan (WMTS)"
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr "IGN orthophoto San Luis (WMTS)"
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr "IGN orthophoto Santa Cruz III (WMTS)"
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr "IGN orthophoto Santa Cruz IV (WMTS)"
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr "IGN orthophoto Santa Cruz VI (WMTS)"
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr "IGN orthophoto Santa Fe and Paraná (WMTS)"
-msgid "IGN Argentina (WMS)"
-msgstr "IGN Argentina (WMS)"
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr "IGN orthophoto Trelew (WMTS)"
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr "IGN orthophoto Tucumán (WMTS)"
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr "IGN orthophoto Ushuaia (WMTS)"
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
+msgstr ""
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI černobíle 2.5m"
@@ -16975,11 +17133,11 @@ msgstr "SDFE Cadastral Parcels INSPIRE View"
msgid "SDFE DTK Kort25"
msgstr "SDFE DTK Kort25"
-msgid "SDFE Terræn Skyggekort (40 cm)"
-msgstr "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
+msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
-msgstr "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
+msgstr ""
msgid "SDFE Skærmkort"
msgstr "SDFE Skærmkort"
@@ -17432,6 +17590,18 @@ msgstr "OSMIE Dail Election Areas"
msgid "OSMIE T.ie Land not in Counties"
msgstr "OSMIE T.ie Land not in Counties"
+msgid "Israel Hiking"
+msgstr "Israel Hiking"
+
+msgid "Israel Hiking map"
+msgstr "Israel Hiking map"
+
+msgid "Israel MTB"
+msgstr "Israel MTB"
+
+msgid "Israel MTB map"
+msgstr "Israel MTB map"
+
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
@@ -24460,7 +24630,7 @@ msgid "Flagpole"
msgstr "Vlajkový stožár"
msgid "Cross"
-msgstr ""
+msgstr "Kříž"
msgid "Works"
msgstr "Továrna"
@@ -29915,8 +30085,8 @@ msgstr "Zdroj:"
msgid "Name:"
msgstr "Název:"
-msgid "updated building info"
-msgstr "aktualizované údaje o budově"
+msgid "update building info"
+msgstr "aktualizovat informace o budově"
msgid "Tag Element"
msgstr "Označkovat prvek"
@@ -29942,8 +30112,11 @@ msgstr "Výběr plochy"
msgid "Trying to detect an area at:"
msgstr "Zkouším najít plochu na:"
-msgid "Created area"
-msgstr "Vytvořená plocha"
+msgid "create building"
+msgstr "vytvořit budovu"
+
+msgid "replace building"
+msgstr "nahradit budovu"
msgid "Add address"
msgid_plural "Add addresses"
@@ -30061,6 +30234,12 @@ msgstr ""
"Pokusí se automaticky najít správnou adresu pomocí doplňku Austria Address "
"Helper plugin"
+msgid "Replace existing buildings"
+msgstr "Nahradit existující budovy"
+
+msgid "Replace an existing building with the new one."
+msgstr "Nahradí existující budovu novou."
+
msgid "Debug"
msgstr "Ladění"
@@ -34223,6 +34402,15 @@ msgstr "Tisk selhal."
msgid "Repeat last fix"
msgstr "Opakovat poslední opravu"
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+"Relace obsahuje nekompletní členy. Chcete je stáhnout a pokračovat v třídění?"
+
+msgid "Incomplete Members"
+msgstr "Nekompletní členy"
+
msgid "Do you want to make the roundabout round?"
msgstr "Chcete udělat kruhový objezd kulatým?"
@@ -34275,6 +34463,12 @@ msgstr "Jak chcete pokračovat?"
msgid "PT_Assistant Proceed Request"
msgstr "PT_Assistant Požadavek na pokračování"
+msgid "Bicycle and foot routes Tests"
+msgstr "Testy tras pro jízdní kola a pěší"
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr "VD: Místo zastavení není na cestě"
@@ -34296,6 +34490,9 @@ msgstr ""
"Kontroluje, zda relace route jsou kompatibilní se schématem veřejné dopravy "
"verze 2"
+msgid "PT: Relation member roles do not match tags"
+msgstr "VD: Role členů relace neodpovídají značkám"
+
msgid "Fix error"
msgstr "Opravit chybu"
@@ -34312,8 +34509,21 @@ msgstr ""
"VD: Mezery v trasách lze snížit seřazením členů. Bude ovšem potřeba výsledek "
"zkontrolovat."
-msgid "PT: Relation member roles do not match tags"
-msgstr "VD: Role členů relace neodpovídají značkám"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr "VD: Název první zastávky neodpovídá značce \"from\" relace trasy"
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr "VD: Název poslední zastávky neodpovídá značce \"to\" relace trasy"
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr "VD: První zastávka trasy neodpovídá první cestě"
+
+msgid "PT: The last stop of the route does not match the last way"
+msgstr "VD: Poslední zastávka neopdovídá poslední cestě"
msgid "PT: Route should start and end with a stop_position"
msgstr "VD: Trasa by měla začínat a končit stop_position"
@@ -35568,6 +35778,9 @@ msgstr "Povolit doplněk Tofix"
msgid "Auto delete layer"
msgstr "Automatické mazání vrstvy"
+msgid "Set default url"
+msgstr "Nastavit výchozí URL"
+
msgid "Select the checkbox to:"
msgstr "Zvolte zaškrtávací políčko pro:"
@@ -35592,6 +35805,15 @@ msgstr "<html><a href=\"\">Seznam úkolů</a></html>"
msgid "Select a task ..."
msgstr "Zvolte úkol..."
+msgid "Setting default URL"
+msgstr "Nastavuji výchozí URL"
+
+msgid "Enter the new URL"
+msgstr "Zadejte nové URL"
+
+msgid "Setting new URL: "
+msgstr "Nastavuji nové URL: "
+
msgid "Set download area (m²)"
msgstr "Nastavit oblast stahování (m²)"
@@ -37591,3 +37813,21 @@ msgstr "Vyjet"
msgid "Drive a race car on this layer"
msgstr "Řídit závodní speciál na této vrstvě"
+
+#~ msgid "SDFE Terræn Skyggekort (40 cm)"
+#~ msgstr "SDFE Terræn Skyggekort (40 cm)"
+
+#~ msgid "SDFE Overflade Skyggekort (40 cm)"
+#~ msgstr "SDFE Overflade Skyggekort (40 cm)"
+
+#~ msgid "Ministerio de Energía y Minería (WMS)"
+#~ msgstr "Ministerio de Energía y Minería (WMS)"
+
+#~ msgid "Ministerio de Agroindustria (WMS)"
+#~ msgstr "Ministerio de Agroindustria (WMS)"
+
+#~ msgid "Mapa Educativo (WMS)"
+#~ msgstr "Mapa Educativo (WMS)"
+
+#~ msgid "PT: There is a gap in the bicycle / foot / horse route"
+#~ msgstr "VD: V trase pro jízdní kola / pěší / jezdce na koni je mezera"
diff --git a/i18n/po/cy.po b/i18n/po/cy.po
index f71ed55..b57b411 100644
--- a/i18n/po/cy.po
+++ b/i18n/po/cy.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2009-07-17 21:45+0000\n"
"Last-Translator: iggy23 <Unknown>\n"
"Language-Team: Welsh <cy at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
"2 : 3;\n"
-"X-Launchpad-Export-Date: 2017-07-03 05:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:06+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: cy\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2404,6 +2404,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2500,6 +2503,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2677,6 +2686,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7840,6 +7852,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7876,6 +7891,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13252,6 +13270,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14844,9 +14865,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14986,10 +15019,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15406,10 +15556,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15835,6 +15985,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27748,7 +27910,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27775,7 +27937,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27878,6 +28043,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31767,6 +31938,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31813,6 +31992,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31832,6 +32017,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31846,7 +32034,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33050,6 +33251,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33074,6 +33278,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/da.po b/i18n/po/da.po
index 8aa4d6d..0b0686f 100644
--- a/i18n/po/da.po
+++ b/i18n/po/da.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
-"PO-Revision-Date: 2017-07-02 13:03+0000\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
+"PO-Revision-Date: 2017-07-28 19:58+0000\n"
"Last-Translator: Jørn <joern.map at gmail.com>\n"
"Language-Team: Dansk <kde-i18n-doc at kde.org>\n"
"MIME-Version: 1.0\n"
"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-07-03 04:39+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:40+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: da_DK\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -2581,6 +2581,9 @@ msgstr "Søge syntaks"
msgid "Invalid search expression"
msgstr "Ugyldigt søgeudtryk"
+msgid "Search by preset"
+msgstr "Søg via prædefinerede"
+
msgid "Filter"
msgstr "Filter"
@@ -2684,6 +2687,12 @@ msgstr "alle lukkede veje"
msgid "object without useful tags"
msgstr "objekt uden brugbare tags"
+msgid "all objects that use the address preset"
+msgstr "alle objekter der bruger prædefinerede adresser"
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr "alle objekter der bruger prædefinerede under Geografi/Naturgruppen"
+
msgid "metadata"
msgstr "metadata"
@@ -2878,6 +2887,9 @@ msgstr "Positivt heltal forventet"
msgid "Range of numbers expected"
msgstr "Forventet talområde"
+msgid "Unknown preset name: "
+msgstr "Ukendt prædefineret navn: "
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Uventet udtryk. Forventede {0}, fandt {1}"
@@ -8419,6 +8431,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Forkert antal argumenter til bogmærket"
+msgid "Home location"
+msgstr "Hjemsted"
+
msgid "Error reading bookmark entry: %s"
msgstr "Fejl ved læsning af bogmærkeemnet: %s"
@@ -8458,6 +8473,9 @@ msgstr "Fjern de nu markerede bogmærker"
msgid "Rename the currently selected bookmark"
msgstr "Omdøb det markerede bogmærke"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr "Download bogmærker for mine {0} sidste ændringer"
+
msgid "min lat"
msgstr "min. bredde"
@@ -14369,6 +14387,9 @@ msgstr "Ulovlig værdi af attribut ''{0}'' på XML tag ''{1}''. Fik {2}."
msgid "Reading user info ..."
msgstr "Indlæser brugerinfo ..."
+msgid "Reading user preferences ..."
+msgstr "Læser brugerindstillinger ..."
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Begynder at uploade med en forespørgsel pr primitiv..."
@@ -16221,9 +16242,27 @@ msgstr "Mapbox Satellite"
msgid "DigitalGlobe Premium Imagery"
msgstr "DigitalGlobe Premium Imagery"
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+
msgid "DigitalGlobe Standard Imagery"
msgstr "DigitalGlobe Standard Imagery"
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -16368,11 +16407,128 @@ msgstr "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
-msgid "IGN Argentina (TMS)"
-msgstr "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr "IGN topographical map (TMS)"
+
+msgid "IGN topographical map (WMS)"
+msgstr "IGN topographical map (WMS)"
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr "IGN orthophoto AMBA a (WMTS)"
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr "IGN orthophoto AMBA b (WMTS)"
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr "IGN orthophoto AMBA c (WMTS)"
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr "IGN orthophoto AMBA d (WMTS)"
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr "IGN orthophoto AMBA e (WMTS)"
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr "IGN orthophoto AMBA f (WMTS)"
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr "IGN orthophoto AMBA 4 (WMTS)"
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr "IGN orthophoto AMBA 5 (WMTS)"
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr "IGN orthophoto AMBA 6 (WMTS)"
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr "IGN orthophoto AMBA 7 (WMTS)"
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr "IGN orthophoto Barranqueras (WMTS)"
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr "IGN orthophoto Catamarca (WMTS)"
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr "IGN orthophoto Córdoba (WMTS)"
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr "IGN orthophoto El Calafate (WMTS)"
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr "IGN orthophoto El Rodeo (WMTS)"
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr "IGN orthophoto Jujuy (WMTS)"
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr "IGN orthophoto La Rioja (WMTS)"
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr "IGN orthophoto Mendoza (WMTS)"
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr "IGN orthophoto Neuquén (WMTS)"
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr "IGN orthophoto Posadas (WMTS)"
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr "IGN orthophoto Resistencia (WMTS)"
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr "IGN orthophoto Río Gallegos (WMTS)"
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr "IGN orthophoto Río Grande (WMTS)"
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr "IGN orthophoto Río Paraná A (WMTS)"
-msgid "IGN Argentina (WMS)"
-msgstr "IGN Argentina (WMS)"
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr "IGN orthophoto Río Paraná B (WMTS)"
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr "IGN orthophoto Rosario (WMTS)"
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr "IGN orthophoto Salto Grande (WMTS)"
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr "IGN orthophoto San Juan (WMTS)"
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr "IGN orthophoto San Luis (WMTS)"
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr "IGN orthophoto Santa Cruz III (WMTS)"
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr "IGN orthophoto Santa Cruz IV (WMTS)"
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr "IGN orthophoto Santa Cruz VI (WMTS)"
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr "IGN orthophoto Santa Fe and Paraná (WMTS)"
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr "IGN orthophoto Trelew (WMTS)"
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr "IGN orthophoto Tucumán (WMTS)"
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr "IGN orthophoto Ushuaia (WMTS)"
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
+msgstr ""
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI black-and-white 2.5m"
@@ -16797,11 +16953,11 @@ msgstr "SDFE matrikelkort INSPIRE visning"
msgid "SDFE DTK Kort25"
msgstr "SDFE DTK Kort25"
-msgid "SDFE Terræn Skyggekort (40 cm)"
-msgstr "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
+msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
-msgstr "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
+msgstr ""
msgid "SDFE Skærmkort"
msgstr "SDFE Skærmkort"
@@ -17254,6 +17410,18 @@ msgstr "OSMIE Dail Election Areas"
msgid "OSMIE T.ie Land not in Counties"
msgstr "OSMIE T.ie Land not in Counties"
+msgid "Israel Hiking"
+msgstr "Israel Hiking"
+
+msgid "Israel Hiking map"
+msgstr "Israel Hiking map"
+
+msgid "Israel MTB"
+msgstr "Israel MTB"
+
+msgid "Israel MTB map"
+msgstr "Israel MTB map"
+
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
@@ -28588,24 +28756,25 @@ msgstr "Mapillary lag"
msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
msgstr ""
+"{0} sekvenser, der hver indeholder mellem {1} og {2} billeder (ø {3})"
msgid "{0} imported images"
-msgstr ""
+msgstr "{0} importerede billeder"
msgid "{0} downloaded images"
-msgstr ""
+msgstr "{0} downloadede billeder"
msgid "{0} images in total"
-msgstr ""
+msgstr "{0} billeder i alt"
msgid "{0} images in {1} sequences"
-msgstr ""
+msgstr "{0} billeder i {1} sekvenser"
msgid "Mapillary object layer"
-msgstr ""
+msgstr "Mapillary objekt lag"
msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
+msgstr "Viser laget der viser de kortobjekter, der er fundet af Mapillary"
msgid "Mapillary"
msgstr "Mapillary"
@@ -28653,16 +28822,16 @@ msgid "Submit the current changeset to Mapillary"
msgstr "Indsend det aktuelle rettesæt til Mapillary"
msgid "rejected"
-msgstr ""
+msgstr "afvist"
msgid "pending"
msgstr "afventer"
msgid "approved"
-msgstr ""
+msgstr "godkendt"
msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr ""
+msgstr "{0} indsendte billeder, Rettesæt nøgle: {1}, Tilstand: {2}"
msgid "Changeset upload failed with {0} error ''{1} {2}''!"
msgstr "Rettesæt upload mislykkedes med {0} fejl ''{1} {2}''!"
@@ -28799,7 +28968,7 @@ msgid "No image selected"
msgstr "Intet billede valgt"
msgid "Press \"{0}\" to download images"
-msgstr ""
+msgstr "Tryk \"{0}\" for at downloade billeder"
msgid "Mapillary picture"
msgstr "Mapillary billede"
@@ -28859,10 +29028,10 @@ msgid "Preview images when hovering its icon"
msgstr "Forhåndsvis billeder når markør er over dets ikon"
msgid "Cut off sequences at download bounds"
-msgstr ""
+msgstr "Afskær sekvenser ved download grænse"
msgid "Enable experimental beta-features (might be unstable)"
-msgstr ""
+msgstr "Aktiver eksperimentelle beta-funktioner (muligvis ustabil)"
msgid "Download mode"
msgstr "Download tilstand"
@@ -28898,139 +29067,150 @@ msgid "Go forward"
msgstr "Gå frem"
msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
+msgstr "Hvilke billedlag vil du importere til Mapillary laget?"
msgid "Import"
msgstr "Importer"
msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
+msgstr "Kunne ikke importere et geotagget billede til Mapillary laget!"
msgid "{0} ({1} images)"
-msgstr ""
+msgstr "{0} ({1} billeder)"
msgid ""
"From which source do you want to import images to the Mapillary layer?"
-msgstr ""
+msgstr "Fra hvilken kilde vil du importere billeder til Mapillary laget?"
msgid "There are currently no layers with geotagged images!"
-msgstr ""
+msgstr "Der er i øjeblikket ingen lag med geotagged billeder!"
msgid "Images from my file system"
-msgstr ""
+msgstr "Billeder fra mit filsystem"
msgid "Select the images you want to import"
-msgstr ""
+msgstr "Vælg de billeder du vil importere"
msgid "All images in a directory"
-msgstr ""
+msgstr "Alle billeder i en mappe"
msgid "Select directory to import images from"
-msgstr ""
+msgstr "Vælg mappe til at importere billeder fra"
msgid "From existing image layer"
-msgstr ""
+msgstr "Fra eksisterende billedlag"
msgid "Import exception"
-msgstr ""
+msgstr "Import handling"
msgid "Could not import the image ''{0}''!"
-msgstr ""
+msgstr "Kunne ikke importere billedet ''{0}''!"
msgid "Could not import the directory ''{0}''!"
-msgstr ""
+msgstr "Kunne ikke importere mappen ''{0}''!"
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
+"Et tag med nøgle <i>{0}</i> er allerede til stede på det valgte OSM objekt."
msgid ""
"Do you really want to replace the current value <i>{0}</i> with the new "
"value <i>{1}</i>?"
msgstr ""
+"Vil du virkelig erstatte den nuværende værdi <i>{0}</i> med den nye værdi "
+"<i>{1}</i>?"
msgid "Tag conflict"
-msgstr ""
+msgstr "Tag konflikt"
msgid "Key copied to clipboard"
-msgstr ""
+msgstr "Nøgle kopieret til udklipsholder"
msgid ""
"The Mapillary plugin now uses a separate panel to display extra information "
"(like the image key) and actions for the currently selected Mapillary image "
"(like viewing it in a browser)."
msgstr ""
+"Mapillary udvidelsen bruger nu et separat panel til at vise ekstra "
+"information (som billednøglen) og handlinger for det aktuelt valgte "
+"Mapillary billede (som at se det i en browser)."
msgid ""
"It can be activated by clicking the left button at the bottom of this "
"message or the button in the toolbar on the left, which uses the same icon."
msgstr ""
+"Det kan aktiveres ved at klikke på den venstre knap nederst i denne "
+"meddelelse eller knappen i værktøjslinjen til venstre, som bruger det samme "
+"ikon."
msgid "I got it, close this."
-msgstr ""
+msgstr "Jeg fik det, luk dette."
msgid "Image info"
-msgstr ""
+msgstr "Billedinformation"
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+"Viser detaljerede oplysninger om det aktuelt valgte Mapillary billede"
msgid "Show detections on top of image"
-msgstr ""
+msgstr "Vis detekteringer oven på billedet"
msgid "View in browser"
-msgstr ""
+msgstr "Vis i browser"
msgid "Copy key"
-msgstr ""
+msgstr "Kopier nøgle"
msgid "Add Mapillary tag"
-msgstr ""
+msgstr "Tilføj Mapillary tag"
msgid "Image detections"
-msgstr ""
+msgstr "Billedetektioner"
msgid "Image actions"
-msgstr ""
+msgstr "Billedhandlinger"
msgid "Image key"
-msgstr ""
+msgstr "Billednøgle"
msgid "Sequence key"
-msgstr ""
+msgstr "Sekvensnøgle"
msgid "{0} detections"
-msgstr ""
+msgstr "{0} detekteringer"
msgid "image has no key"
-msgstr ""
+msgstr "Billedet har ingen nøgle"
msgid "unknown user"
-msgstr ""
+msgstr "ukendt bruger"
msgid "sequence has no key"
-msgstr ""
+msgstr "sekvens har ingen nøgle"
msgid "Could not open the URL {0} in a browser"
-msgstr ""
+msgstr "Kunne ikke åbne URL {0} i en browser"
msgid "Downloading map objects…"
-msgstr ""
+msgstr "Downloader kortobjekter…"
msgid "All map objects loaded."
-msgstr ""
+msgstr "Alle kortobjekter er indlæst."
msgid "Too many map objects, zoom in to see all."
-msgstr ""
+msgstr "For mange kortobjekter, zoom ind for at se alle."
msgid "Downloading map objects failed!"
-msgstr ""
+msgstr "Downloading af kortobjekter mislykkedes!"
msgid "Mapillary objects"
-msgstr ""
+msgstr "Mapillary objekter"
msgid "Displays objects detected by Mapillary from their street view imagery"
msgstr ""
+"Viser objekter der er registreret af Mapillary fra deres gade niveau billeder"
msgid "Deleted {0} image"
msgid_plural "Deleted {0} images"
@@ -29059,13 +29239,16 @@ msgid "2 images unjoined"
msgstr "2 billeder adskilt"
msgid "Could not read from URL {0}!"
-msgstr ""
+msgstr "Kunne ikke læse fra URL {0}!"
msgid ""
"{0}\n"
"Could not read map objects from URL\n"
"{1}!"
msgstr ""
+"{0}\n"
+"Kunne ikke læse kortobjekter fra URL\n"
+"{1}!"
msgid "everything in the visible area"
msgstr "alt i det synlige område"
@@ -29730,8 +29913,8 @@ msgstr "Kilde:"
msgid "Name:"
msgstr "Navn:"
-msgid "updated building info"
-msgstr "opdateret bygningsinfo"
+msgid "update building info"
+msgstr "opdater bygningsinfo"
msgid "Tag Element"
msgstr "Tag element"
@@ -29757,8 +29940,11 @@ msgstr "Område vælger"
msgid "Trying to detect an area at:"
msgstr "Forsøger at finde et område ved:"
-msgid "Created area"
-msgstr "Oprettet område"
+msgid "create building"
+msgstr "opret bygning"
+
+msgid "replace building"
+msgstr "erstat bygningen"
msgid "Add address"
msgid_plural "Add addresses"
@@ -29876,6 +30062,12 @@ msgstr ""
"Prøver automatisk at finde den rigtige adresse via østrigsk adresse hjælper "
"udvidelse"
+msgid "Replace existing buildings"
+msgstr "Erstat eksisterende bygninger"
+
+msgid "Replace an existing building with the new one."
+msgstr "Erstat en eksisterende bygning med den nye."
+
msgid "Debug"
msgstr "Fejlfind"
@@ -29883,7 +30075,7 @@ msgid "Debugging mode will write images for each processing step."
msgstr "Fejlfindingstilstand vil skrive billeder for hver behandlingstrin."
msgid "Please choose the address type"
-msgstr ""
+msgstr "Vælg adressetypen"
msgid ""
"<html>We could not automatically determine whether <strong>{0}</strong> "
@@ -29927,7 +30119,7 @@ msgid "No address was found for this object."
msgstr ""
msgid "An unexpected exception occurred:"
-msgstr ""
+msgstr "Der opstod en uventet handling:"
msgid "Building Generalization"
msgstr "Bygnings generalisering"
@@ -33988,11 +34180,21 @@ msgstr "Udskrivning mislykkedes."
msgid "Repeat last fix"
msgstr "Gentag seneste rettelse"
-msgid "Do you want to make the roundabout round?"
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
msgstr ""
+"Relationen har ufuldstændige medlemmer. Vil du downloade dem og fortsætte "
+"med sorteringen?"
+
+msgid "Incomplete Members"
+msgstr "Ufuldstændige medlemmer"
+
+msgid "Do you want to make the roundabout round?"
+msgstr "Vil du lave rundkørslen rund?"
msgid "Roundabout round"
-msgstr ""
+msgstr "Rundkørsel afrunde"
msgid "Do you want to download referrers of platforms and stop positions?"
msgstr "Vil du at downloade refererende platforme og stoppositioner?"
@@ -34037,6 +34239,12 @@ msgstr "Hvordan vil du fortsætte?"
msgid "PT_Assistant Proceed Request"
msgstr "OT_Assistent fortsæt anmodning"
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr "OT: Stop_position er ikke en del af en vej"
@@ -34058,6 +34266,9 @@ msgid ""
msgstr ""
"Tjek om rute relationer er kompatible med offentlig transport version 2"
+msgid "PT: Relation member roles do not match tags"
+msgstr "OT: Relations medlems roller passer ikke til tags"
+
msgid "Fix error"
msgstr "Ret fejl"
@@ -34071,9 +34282,24 @@ msgid ""
"PT: Route gaps can decrease by sorting members. Further validations will be "
"required"
msgstr ""
+"OT: Rute huller antal kan falde ved at sortere medlemmer. Yderligere "
+"valideringer vil blive påkrævet"
-msgid "PT: Relation member roles do not match tags"
-msgstr "OT: Relations medlems roller passer ikke til tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
+msgstr ""
msgid "PT: Route should start and end with a stop_position"
msgstr "OT: Rute skal starte og slutte med en stop_position"
@@ -35325,6 +35551,9 @@ msgstr "Aktiver Skal-rettes udvidelse"
msgid "Auto delete layer"
msgstr "Slet lag automatisk"
+msgid "Set default url"
+msgstr "Sæt standard url"
+
msgid "Select the checkbox to:"
msgstr "Vælg afkrydsningsfeltet for at:"
@@ -35349,6 +35578,15 @@ msgstr "<html><a href=\"\">Liste over opgaver</a></html>"
msgid "Select a task ..."
msgstr "Vælg en opgave ..."
+msgid "Setting default URL"
+msgstr "Indstilling af standard URL"
+
+msgid "Enter the new URL"
+msgstr "Indtast den nye URL"
+
+msgid "Setting new URL: "
+msgstr "Indstilling af ny URL: "
+
msgid "Set download area (m²)"
msgstr "Sæt download område (m²)"
@@ -37325,3 +37563,18 @@ msgstr "Kør afsted"
msgid "Drive a race car on this layer"
msgstr "Kør en racerbil på dette lag"
+
+#~ msgid "SDFE Terræn Skyggekort (40 cm)"
+#~ msgstr "SDFE Terræn Skyggekort (40 cm)"
+
+#~ msgid "SDFE Overflade Skyggekort (40 cm)"
+#~ msgstr "SDFE Overflade Skyggekort (40 cm)"
+
+#~ msgid "Mapa Educativo (WMS)"
+#~ msgstr "Mapa Educativo (WMS)"
+
+#~ msgid "Ministerio de Agroindustria (WMS)"
+#~ msgstr "Ministerio de Agroindustria (WMS)"
+
+#~ msgid "Ministerio de Energía y Minería (WMS)"
+#~ msgstr "Ministerio de Energía y Minería (WMS)"
diff --git a/i18n/po/de.po b/i18n/po/de.po
index 280b2f7..e820375 100644
--- a/i18n/po/de.po
+++ b/i18n/po/de.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
-"PO-Revision-Date: 2017-06-25 17:21+0000\n"
-"Last-Translator: Klumbumbus <Unknown>\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
+"PO-Revision-Date: 2017-07-27 20:01+0000\n"
+"Last-Translator: holger (lp) <Unknown>\n"
"Language-Team: JOSM\n"
"MIME-Version: 1.0\n"
"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-07-03 04:43+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:44+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: de\n"
"X-Poedit-SearchPath-0: .\n"
"X-Poedit-Basepath: /home/simon/src/josm.all/i18n\n"
@@ -2659,6 +2659,9 @@ msgstr "Suchsyntax"
msgid "Invalid search expression"
msgstr "Ungültiger Suchausdruck"
+msgid "Search by preset"
+msgstr "Suche mittels Vorlage"
+
msgid "Filter"
msgstr "Filter"
@@ -2763,6 +2766,13 @@ msgstr "Alle geschlossenen Linien"
msgid "object without useful tags"
msgstr "Objekt ohne nützliche Merkmale"
+msgid "all objects that use the address preset"
+msgstr "alle Objekte, die die Adress-Vorlage verwenden"
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+"alle Objekte, die eine der Vorlagen aus der Gruppe Geografie/Natur verwenden"
+
msgid "metadata"
msgstr "Metadaten"
@@ -2959,6 +2969,9 @@ msgstr "Positive Ganzzahl erwartet"
msgid "Range of numbers expected"
msgstr "Erwarte einen Zahlenbereich"
+msgid "Unknown preset name: "
+msgstr "Unbekannter Vorlagen-Name: "
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Unerwartete Kennung: erwartet {0}, erhalten {1}"
@@ -8639,6 +8652,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Falsche Anzahl Argumente für Lesezeichen"
+msgid "Home location"
+msgstr "Heimat-Standort"
+
msgid "Error reading bookmark entry: %s"
msgstr "Fehler beim Lesen von Lesezeicheneintrag: %s"
@@ -8679,6 +8695,9 @@ msgstr "Entfernt die ausgewählten Lesezeichen"
msgid "Rename the currently selected bookmark"
msgstr "Benennt das ausgewählte Lesezeichen um"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr "Lesezeichen für meine letzten {0} Änderungssätze herunterladen"
+
msgid "min lat"
msgstr "min Breite"
@@ -14816,6 +14835,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Benutzerinformationen werden gelesen …"
+msgid "Reading user preferences ..."
+msgstr "Nutzereinstellungen einlesen …"
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Hochladen wird mit einer Anfrage pro Objekt begonnen …"
@@ -16734,9 +16756,21 @@ msgstr "Mapbox Satellitenbild"
msgid "DigitalGlobe Premium Imagery"
msgstr "DigitalGlobe Premium Luftbilder"
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr "DigitalGlobe Standard Luftbilder"
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -16887,11 +16921,128 @@ msgstr "imagico.de OSM Bilder für die Kartierung: Enderbyland und Kemp-Küste"
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr "Sentinel-2 Bilder von Enderbyland und Kemp-Küste (Echtfarben)"
-msgid "IGN Argentina (TMS)"
-msgstr "IGN (Nationales Institut für Geografie) Argentinien (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr "IGN topografische Karte (TMS)"
+
+msgid "IGN topographical map (WMS)"
+msgstr "IGN topografische Karte (WMS)"
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr "IGN Orthofoto AMBA a (WMTS)"
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr "IGN Orthofoto AMBA b (WMTS)"
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr "IGN Orthofoto AMBA c (WMTS)"
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr "IGN Orthofoto AMBA d (WMTS)"
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr "IGN Orthofoto AMBA e (WMTS)"
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr "IGN Orthofoto AMBA f (WMTS)"
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr "IGN Orthofoto AMBA 4 (WMTS)"
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr "IGN Orthofoto AMBA 5 (WMTS)"
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr "IGN Orthofoto AMBA 6 (WMTS)"
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr "IGN Orthofoto AMBA 7 (WMTS)"
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr "IGN Orthofoto Barranqueras (WMTS)"
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr "IGN Orthofoto Catamarca (WMTS)"
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr "IGN Orthofoto Córdoba (WMTS)"
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr "IGN Orthofoto El Calafate (WMTS)"
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr "IGN Orthofoto El Rodeo (WMTS)"
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr "IGN Orthofoto Jujuy (WMTS)"
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr "IGN Orthofoto La Rioja (WMTS)"
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr "IGN Orthofoto Mendoza (WMTS)"
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr "IGN Orthofoto Neuquén (WMTS)"
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr "IGN Orthofoto Posadas (WMTS)"
-msgid "IGN Argentina (WMS)"
-msgstr "IGN Argentinien (WMS)"
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr "IGN Orthofoto Resistencia (WMTS)"
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr "IGN Orthofoto Río Gallegos (WMTS)"
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr "IGN Orthofoto Río Grande (WMTS)"
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr "IGN Orthofoto Río Paraná A (WMTS)"
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr "IGN Orthofoto Río Paraná B (WMTS)"
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr "IGN Orthofoto Rosario (WMTS)"
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr "IGN Orthofoto Salto Grande (WMTS)"
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr "IGN Orthofoto San Juan (WMTS)"
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr "IGN Orthofoto San Luis (WMTS)"
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr "IGN Orthofoto Santa Cruz III (WMTS)"
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr "IGN Orthofoto Santa Cruz IV (WMTS)"
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr "IGN Orthofoto Santa Cruz VI (WMTS)"
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr "IGN Orthofoto Santa Fe und Paraná (WMTS)"
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr "IGN Orthofoto Trelew (WMTS)"
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr "IGN Orthofoto Tucumán (WMTS)"
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr "IGN Orthofoto Ushuaia (WMTS)"
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
+msgstr ""
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI Schwarzweiß 2.5m"
@@ -17190,34 +17341,34 @@ msgid "DER-ES"
msgstr "DER-ES"
msgid "IBGE-BC250 Isolated Rural Location"
-msgstr ""
+msgstr "IBGE-BC250 Isolierte Siedlungen"
msgid "IBGE-BC250 Landing strip"
-msgstr ""
+msgstr "IBGE-BC250 Landebahn"
msgid "IBGE-BC250 River drains"
-msgstr ""
+msgstr "IBGE-BC250 Flussabläufe"
msgid "IBGE-BC250 Highways stretches"
-msgstr ""
+msgstr "IBGE-BC250 Straßentrassen"
msgid "IBGE-BC250 Indigenous Lands"
-msgstr ""
+msgstr "IBGE-BC250 Ureinwohnergebiete"
msgid "IBGE-BC250 Public Land (Military)"
-msgstr ""
+msgstr "IBGE-BC250 Öffentliches Land (Militär)"
msgid "IBGE-BC250 Units of Sustainable Use - APA"
-msgstr ""
+msgstr "IBGE-BC250 Einheiten der nachhaltigen Nutzung - APA"
msgid "IBGE-BC250 Villages"
-msgstr ""
+msgstr "IBGE-BC250 Dörfer"
msgid "IBGE-BCIM Stations for Electrical Power Generation"
-msgstr ""
+msgstr "IBGE-BCIM Standorte für Stromerzeugung"
msgid "IBGE-BCIM Municipalities"
-msgstr ""
+msgstr "IBGE-BCIM Gemeinden"
msgid "Geobase Hydrography"
msgstr "Geobasis Hydrografie"
@@ -17326,11 +17477,11 @@ msgstr "SDFE Flurstücke INSPIRE Ansicht"
msgid "SDFE DTK Kort25"
msgstr "SDFE DTK Kort25"
-msgid "SDFE Terræn Skyggekort (40 cm)"
-msgstr "SDFE Gelände Schattenkarte (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
+msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
-msgstr "SDFE Oberfläche Schattenkarte (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
+msgstr ""
msgid "SDFE Skærmkort"
msgstr ""
@@ -17789,6 +17940,18 @@ msgstr "OSMIE Dail (Unterhaus) Wahlgebiete"
msgid "OSMIE T.ie Land not in Counties"
msgstr "OSMIE Land nicht in Landkreisen"
+msgid "Israel Hiking"
+msgstr "Israel Wandern"
+
+msgid "Israel Hiking map"
+msgstr "Israelische Wanderkarte"
+
+msgid "Israel MTB"
+msgstr "Israel Mountenbike"
+
+msgid "Israel MTB map"
+msgstr "Israelische Mountenbikekarte"
+
msgid "Lodi - Italy"
msgstr "Lodi - Italien"
@@ -17877,21 +18040,23 @@ msgid "Niger Delta Oct 2012 Landsat"
msgstr "Nigerdelta Okt 2012 Landsat"
msgid "PDOK aerial imagery Beeldmateriaal.nl 25cm"
-msgstr ""
+msgstr "PDOK Luftbilder Beeldmateriaal.nl 25cm"
msgid ""
"Nationwide data set 25cm resolution color aerial imagery of the most recent "
"year."
msgstr ""
+"Landesweiter Datensatz farbiger Luftbilder mit 25cm Auflösung des "
+"vergangenen Jahres."
msgid "PDOK aerial imagery Beeldmateriaal.nl 25cm (WMTS)"
-msgstr ""
+msgstr "PDOK Luftbilder Beeldmateriaal.nl 25cm (WMTS)"
msgid "LINZ NZ Aerial Imagery"
-msgstr ""
+msgstr "LINZ NZ Luftbilder"
msgid "LINZ NZ Topo50 Gridless Maps"
-msgstr ""
+msgstr "LINZ NZ Topo50 Gitterlose Karten"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Spitzbergen - Orthofoto 2009/2011 EPSG:25833"
@@ -17900,7 +18065,7 @@ msgid "imagico.de OSM images for mapping: Svalbard mosaic"
msgstr "imagico.de OSM-Bilder zum Kartieren: Spitzbergen-Mosaik"
msgid "Sentinel-2 mosaic of Svalbard (true color)"
-msgstr ""
+msgstr "Sentinel-2 Mosaik von Svalbard (Echtfarben)"
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -17910,6 +18075,8 @@ msgid ""
"Represents approximately minimum snow cover so can be well used for glacier "
"mapping (true color)"
msgstr ""
+"Stellt nahezu minimale Schneedecke dar, kann gut für Gletscherkartierung "
+"genutzt werden (Echtfarben)"
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Gazastreifen - Pléiades - 2014/07/06"
@@ -17943,6 +18110,8 @@ msgstr "imagico.de OSM Bilder für die Kartierung: Neuirland"
msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
msgstr ""
+"Viele fehlende Inseln in OSM (mittlerweile größtenteils kartiert) "
+"(Echtfarben)"
msgid "imagico.de OSM images for mapping: Coropuna"
msgstr "imagico.de OSM Bilder für die Kartierung: Coropuna"
@@ -17954,7 +18123,7 @@ msgstr ""
"Eiskappe"
msgid "Poor and outdated imagery in other sources (true color)"
-msgstr ""
+msgstr "Schlechte und veraltete Bilder bei anderen Quellen (Echtfarben)"
msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr "Pangasinán/Bulacan (Philippinen hochaufgelöst)"
@@ -18102,6 +18271,7 @@ msgstr "imagico.de OSM-Bilder zum Kartieren: Petschoraseeküste"
msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
msgstr ""
+"Sentinel-2-Bild der Petschora-Meeresküste im Herbst 2016 (Echtfarben)"
msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
msgstr "imagico.de OSM Bilder für die Kartierung: Uschakow-Insel August 2016"
@@ -18127,7 +18297,7 @@ msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr "imagico.de OSM Bilder für die Kartierung: Kosmodrom Wostotschny"
msgid "Recent image showing newest features (true color)"
-msgstr ""
+msgstr "Neues Bild mit den neuesten Eigenschaften (Echtfarben)"
msgid "Freemap.sk Car"
msgstr "Freemap.sk Auto"
@@ -18180,7 +18350,7 @@ msgid "imagico.de OSM images for mapping: Scott Island"
msgstr "imagico.de OSM Bilder für die Kartierung: Scott-Insel"
msgid "Missing in other image sources (true color)"
-msgstr ""
+msgstr "Fehlt bei anderen Bildquellen (Echtfarben)"
msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
msgstr "imagico.de OSM Bilder für die Kartierung: Leskov Island Landsat"
@@ -18217,6 +18387,7 @@ msgstr "imagico.de OSM Bilder für die Kartierung: Adamsbrücke"
msgid "Supplementing incomplete coverage in other sources (true color)"
msgstr ""
+"Ergänzung der unvollständigen Abdeckung in anderen Quellen (Echtfarben)"
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Kanton Aargau 25cm (AGIS 2011)"
@@ -18368,7 +18539,7 @@ msgid ""
msgstr ""
msgid "NC Combined Orthoimagery"
-msgstr ""
+msgstr "NC Kombinierte Luftbilder"
msgid ""
"This service represents orthoimagery collected from 1995-2013 for the state "
@@ -21763,7 +21934,7 @@ msgid "pegasus"
msgstr "Ampel für Füßgänger, Fahrrad, Pferd (Pegasus)"
msgid "tiger"
-msgstr "Zebrastreifen (Tiger)"
+msgstr "Zebrastreifen \"Tiger\" (Querung mit Fahrrad erlaubt)"
msgid "Button operated"
msgstr "Knopfbetätigt"
@@ -23123,10 +23294,10 @@ msgstr "ja"
msgctxt "airmark"
msgid "Beacon"
-msgstr ""
+msgstr "Leuchtfeuer"
msgid "Navigationaid"
-msgstr ""
+msgstr "Navigationshilfe"
msgid "Windsock"
msgstr "Windsack"
@@ -24848,7 +25019,7 @@ msgstr "Treppenaufgang"
msgctxt "entrance"
msgid "home"
-msgstr ""
+msgstr "Wohnstätte"
msgid "Entrance number"
msgstr "Eingangsnummer"
@@ -24872,7 +25043,7 @@ msgid "Flagpole"
msgstr "Fahnenmast"
msgid "Cross"
-msgstr ""
+msgstr "Kreuz"
msgid "Works"
msgstr "Fabrik"
@@ -25051,7 +25222,7 @@ msgstr "Leuchtturm"
msgctxt "man_made"
msgid "Beacon"
-msgstr ""
+msgstr "Leuchtfeuer"
msgid "Street Lamp"
msgstr "Straßenlampe"
@@ -28032,7 +28203,7 @@ msgid "View %name% sheet of hospital/home"
msgstr "Krankenhaus/Heim-Daten für %name% anzeigen"
msgid "View INSEE explanation of %name% code"
-msgstr ""
+msgstr "INSEE-Beschreibung des %name%-Codes ansehen"
msgid "Get identification card (pdf) for this establishment"
msgstr "Kennkarte (PDF) für diese Einrichtung abrufen"
@@ -28373,7 +28544,7 @@ msgid "highway without a reference"
msgstr "Straße ohne Referenznummer"
msgid "Unspecific highway type"
-msgstr ""
+msgstr "Unbestimmter Straßentyp"
msgid "{0} used with {1}"
msgstr "{0} zusammen mit {1}"
@@ -28739,7 +28910,7 @@ msgstr ""
"Öffentlich (in der Liste und als anonyme, ungeordnete Punkte verfügbar)"
msgid "Trackable (only shared as anonymous, ordered points with timestamps)"
-msgstr "Auffindbar (als anonyme, geordnete Punkte mit Zeitstempel verfügbar)"
+msgstr "Verfolgbar (als anonyme, geordnete Punkte mit Zeitstempel verfügbar)"
msgid ""
"Identifiable (shown in trace list and as identifiable, ordered points with "
@@ -29190,19 +29361,19 @@ msgid "Mapillary layer"
msgstr "Mapillary Ebene"
msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr ""
+msgstr "{0} Sequenzen, jede enthält zwischen {1} und {2} Bilder (ø {3})"
msgid "{0} imported images"
-msgstr ""
+msgstr "{0} importierte Bilder"
msgid "{0} downloaded images"
-msgstr ""
+msgstr "{0} heruntergeladene Bilder"
msgid "{0} images in total"
-msgstr ""
+msgstr "{0} Bilder insgesamt"
msgid "{0} images in {1} sequences"
-msgstr ""
+msgstr "{0} Bilder in {1} Sequenzen"
msgid "Mapillary object layer"
msgstr "Mapillary-Objektebene"
@@ -29257,16 +29428,16 @@ msgid "Submit the current changeset to Mapillary"
msgstr "Aktuellen Änderungssatz zu Mapillary absenden"
msgid "rejected"
-msgstr ""
+msgstr "abgelehnt"
msgid "pending"
msgstr "ausstehend"
msgid "approved"
-msgstr ""
+msgstr "genehmigt"
msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr ""
+msgstr "{0} Bilder eingereicht, Änderungssatzschlüssel: {1}, Status: {2}"
msgid "Changeset upload failed with {0} error ''{1} {2}''!"
msgstr ""
@@ -30366,8 +30537,8 @@ msgstr "Quelle:"
msgid "Name:"
msgstr "Name:"
-msgid "updated building info"
-msgstr "aktualisierte Gebäudeinformation"
+msgid "update building info"
+msgstr "Gebäudeinformation aktualisieren"
msgid "Tag Element"
msgstr "Element mit Merkmal versehen"
@@ -30393,8 +30564,11 @@ msgstr "Flächenauswahl"
msgid "Trying to detect an area at:"
msgstr "Versuche eine Fläche zu erkennen bei:"
-msgid "Created area"
-msgstr "Fläche erzeugt"
+msgid "create building"
+msgstr "Gebäude erstellen"
+
+msgid "replace building"
+msgstr "Gebäude ersetzen"
msgid "Add address"
msgid_plural "Add addresses"
@@ -30514,6 +30688,12 @@ msgstr ""
"Versuche automatisch die korrekte Adresse mittels der Adresshelfer "
"Österreich Erweiterung zu finden"
+msgid "Replace existing buildings"
+msgstr "Existierende Gebäude ersetzen"
+
+msgid "Replace an existing building with the new one."
+msgstr "Ein existierendes Gebäude mit einen neuen ersetzen."
+
msgid "Debug"
msgstr "Fehlerdiagnose"
@@ -34723,11 +34903,21 @@ msgstr "Durcken fehlgeschlagen."
msgid "Repeat last fix"
msgstr "Letzte Korrektur wiederholen"
-msgid "Do you want to make the roundabout round?"
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
msgstr ""
+"Die Relation hat unvollständige Elemente. Sollen sie heruntergeladen und mit "
+"der Sortierung fortgefahren werden?"
+
+msgid "Incomplete Members"
+msgstr "Unvollständige Elemente"
+
+msgid "Do you want to make the roundabout round?"
+msgstr "Möchten Sie den Kreisverkehr rund machen?"
msgid "Roundabout round"
-msgstr ""
+msgstr "Kreisverkehr rund machen"
msgid "Do you want to download referrers of platforms and stop positions?"
msgstr ""
@@ -34774,6 +34964,12 @@ msgstr "Wie möchten Sie fortfahren?"
msgid "PT_Assistant Proceed Request"
msgstr "PT_Assistant Fahranforderung"
+msgid "Bicycle and foot routes Tests"
+msgstr "Fahrrad- und Fußgängerrouten-Tests"
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr "ÖV: Haltepunkt ist nicht Teil einer Linie"
@@ -34796,6 +34992,9 @@ msgstr ""
"Prüft, ob Routen-Relationen kompatibel mit dem Schema des öffentlichen "
"Verkehrs Version 2 sind"
+msgid "PT: Relation member roles do not match tags"
+msgstr "ÖV: Relationsmitgliederrollen passen nicht zu den Merkmalen"
+
msgid "Fix error"
msgstr "Fehler beheben"
@@ -34810,9 +35009,30 @@ msgid ""
"PT: Route gaps can decrease by sorting members. Further validations will be "
"required"
msgstr ""
+"ÖV: Lücken in der Route können durch Sortierung der Elemente verringert "
+"werden. Weitere Prüfungen sind erforderlich"
-msgid "PT: Relation member roles do not match tags"
-msgstr "ÖV: Relationsmitgliederrollen passen nicht zu den Merkmalen"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+"ÖV: Der Name der ersten Haltestelle stimmt nicht mit dem \"von\"-Merkmal der "
+"Routenrelation überein"
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+"ÖV: Der Name der Endhaltestelle stimmt nicht mit dem \"nach\"-Merkmal der "
+"Routenrelation überein"
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+"ÖV: Die erste Haltestelle der Route stimmt nicht mit der ersten Linie überein"
+
+msgid "PT: The last stop of the route does not match the last way"
+msgstr ""
+"ÖV: Die Endhaltestelle der Route stimmt nicht mit der letzten Linie überein"
msgid "PT: Route should start and end with a stop_position"
msgstr "ÖV: Route sollte mit einem Halteplatz beginnen und enden"
@@ -36089,6 +36309,9 @@ msgstr "Tofix-Plugin aktivieren"
msgid "Auto delete layer"
msgstr "Ebene automatisch löschen"
+msgid "Set default url"
+msgstr "Standard-URL festlegen"
+
msgid "Select the checkbox to:"
msgstr "Wählen Sie das Kontrollkästchen dafür aus:"
@@ -36113,6 +36336,15 @@ msgstr "<html><a href=\"\">Liste der Aufgaben</a></html>"
msgid "Select a task ..."
msgstr "Aufgabe auswählen ..."
+msgid "Setting default URL"
+msgstr "Standard-URL wird festgelegt"
+
+msgid "Enter the new URL"
+msgstr "Neue URL eingeben"
+
+msgid "Setting new URL: "
+msgstr "Neue URL festlegen: "
+
msgid "Set download area (m²)"
msgstr "Herunterladebereich festlegen (m²)"
@@ -38170,3 +38402,21 @@ msgstr "Losfahren"
msgid "Drive a race car on this layer"
msgstr "Ein Rennauto auf dieser Ebene fahren"
+
+#~ msgid "SDFE Terræn Skyggekort (40 cm)"
+#~ msgstr "SDFE Gelände Schattenkarte (40 cm)"
+
+#~ msgid "SDFE Overflade Skyggekort (40 cm)"
+#~ msgstr "SDFE Oberfläche Schattenkarte (40 cm)"
+
+#~ msgid "Ministerio de Agroindustria (WMS)"
+#~ msgstr "Ministerium für Agrarindustrie (WMS)"
+
+#~ msgid "Mapa Educativo (WMS)"
+#~ msgstr "Bildungskarte (WMS)"
+
+#~ msgid "Ministerio de Energía y Minería (WMS)"
+#~ msgstr "Ministerium für Energie und Bergbau (WMS)"
+
+#~ msgid "PT: There is a gap in the bicycle / foot / horse route"
+#~ msgstr "ÖV: Es gibt eine Lücke in der Fahrrad-/Füßgänger-/Reitroute"
diff --git a/i18n/po/de_DE.po b/i18n/po/de_DE.po
index 845667b..31ffaf2 100644
--- a/i18n/po/de_DE.po
+++ b/i18n/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2011-07-10 12:32+0000\n"
"Last-Translator: ralekuja <Unknown>\n"
"Language-Team: German (Germany) <de_DE at 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-07-03 05:06+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:08+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2412,6 +2412,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2508,6 +2511,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2685,6 +2694,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7848,6 +7860,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7884,6 +7899,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13260,6 +13278,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14855,9 +14876,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14997,10 +15030,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15417,10 +15567,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15846,6 +15996,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27759,7 +27921,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27786,7 +27948,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27889,6 +28054,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31782,6 +31953,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31828,6 +32007,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31847,6 +32032,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31861,7 +32049,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33065,6 +33266,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33089,6 +33293,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/el.po b/i18n/po/el.po
index ad588b0..13734c2 100644
--- a/i18n/po/el.po
+++ b/i18n/po/el.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2016-01-25 09:17+0000\n"
"Last-Translator: Aggelos Arnaoutis <angelosarn at hotmail.com>\n"
"Language-Team: Greek <el at 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-07-03 04:45+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:45+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: el\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2553,6 +2553,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Μη έγκυρη έκφραση αναζήτησης"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Φίλτρο"
@@ -2652,6 +2655,12 @@ msgstr "όλες τις κλειστές διαδρομές"
msgid "object without useful tags"
msgstr "αντικείμενο χωρίς χρήσιμες ετικέτες"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "μεταδεδομένα"
@@ -2829,6 +2838,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -8099,6 +8111,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Σφάλμα ανάγνωσης καταχώρησης σελιδοδείκτη: %s"
@@ -8137,6 +8152,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "ελαχ. γ. πλάτος"
@@ -13615,6 +13633,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -15236,9 +15257,21 @@ msgstr "Δορυφόρος MapBox"
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -15378,10 +15411,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15798,10 +15948,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -16227,6 +16377,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -28147,7 +28309,7 @@ msgstr ""
msgid "Name:"
msgstr "Όνομα:"
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -28174,7 +28336,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -28277,6 +28442,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -32193,6 +32364,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -32239,6 +32418,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -32258,6 +32443,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -32272,7 +32460,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33479,6 +33680,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33503,6 +33707,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/en_AU.po b/i18n/po/en_AU.po
index 9eaa599..8cd8f63 100644
--- a/i18n/po/en_AU.po
+++ b/i18n/po/en_AU.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2015-06-08 12:52+0000\n"
"Last-Translator: Mark Pulley <mrpulley at lizzy.com.au>\n"
"Language-Team: English (Australia) <en_AU at 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-07-03 05:05+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:07+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2566,6 +2566,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Invalid search expression"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Filter"
@@ -2669,6 +2672,12 @@ msgstr "all closed ways"
msgid "object without useful tags"
msgstr "object without useful tags"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "metadata"
@@ -2856,6 +2865,9 @@ msgstr "Positive integer expected"
msgid "Range of numbers expected"
msgstr "Range of numbers expected"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Unexpected token. Expected {0}, found {1}"
@@ -8314,6 +8326,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Wrong number of arguments for bookmark"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Error reading bookmark entry: %s"
@@ -8353,6 +8368,9 @@ msgstr "Remove the currently selected bookmarks"
msgid "Rename the currently selected bookmark"
msgstr "Rename the currently selected bookmark"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "min lat"
@@ -14110,6 +14128,9 @@ msgstr "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
msgid "Reading user info ..."
msgstr "Reading user info ..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Starting to upload with one request per primitive ..."
@@ -15786,9 +15807,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -15928,10 +15961,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -16348,10 +16498,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -16777,6 +16927,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -28725,7 +28887,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -28752,7 +28914,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -28855,6 +29020,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -32810,6 +32981,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -32856,6 +33035,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -32875,6 +33060,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -32889,7 +33077,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -34098,6 +34299,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -34122,6 +34326,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/en_CA.po b/i18n/po/en_CA.po
index 10b16ae..8d2569d 100644
--- a/i18n/po/en_CA.po
+++ b/i18n/po/en_CA.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2010-09-24 17:25+0000\n"
"Last-Translator: Johann Beda <Unknown>\n"
"Language-Team: English (Canada) <en_CA at 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-07-03 05:07+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:09+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2409,6 +2409,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2505,6 +2508,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2682,6 +2691,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7845,6 +7857,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7881,6 +7896,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13257,6 +13275,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14849,9 +14870,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14991,10 +15024,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15411,10 +15561,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15840,6 +15990,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27753,7 +27915,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27780,7 +27942,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27883,6 +28048,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31772,6 +31943,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31818,6 +31997,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31837,6 +32022,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31851,7 +32039,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33055,6 +33256,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33079,6 +33283,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/en_GB.po b/i18n/po/en_GB.po
index 1dd5ba7..7ddfa75 100644
--- a/i18n/po/en_GB.po
+++ b/i18n/po/en_GB.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: JOSM\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2016-11-01 11:03+0000\n"
"Last-Translator: Andi Chandler <Unknown>\n"
"Language-Team: German <josm-dev at openstreetmap.org>\n"
@@ -18,8 +18,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-07-03 05:05+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:07+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: de\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2573,6 +2573,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Invalid search expression"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Filter"
@@ -2676,6 +2679,12 @@ msgstr "all closed ways"
msgid "object without useful tags"
msgstr "object without useful tags"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "metadata"
@@ -2863,6 +2872,9 @@ msgstr "Positive integer expected"
msgid "Range of numbers expected"
msgstr "Range of numbers expected"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Unexpected token. Expected {0}, found {1}"
@@ -8354,6 +8366,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Wrong number of arguments for bookmark"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Error reading bookmark entry: %s"
@@ -8393,6 +8408,9 @@ msgstr "Remove the currently selected bookmarks"
msgid "Rename the currently selected bookmark"
msgstr "Rename the currently selected bookmark"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "min lat"
@@ -14263,6 +14281,9 @@ msgstr "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
msgid "Reading user info ..."
msgstr "Reading user info ..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Starting to upload with one request per primitive ..."
@@ -16099,9 +16120,21 @@ msgstr "Mapbox Satellite"
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -16241,11 +16274,128 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
-msgstr "IGN Argentina (WMS)"
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
+msgstr ""
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI black-and-white 2.5m"
@@ -16661,10 +16811,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -17092,6 +17242,18 @@ msgstr "OSMIE Dail Election Areas"
msgid "OSMIE T.ie Land not in Counties"
msgstr "OSMIE T.ie Land not in Counties"
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
@@ -29330,8 +29492,8 @@ msgstr ""
msgid "Name:"
msgstr "Name:"
-msgid "updated building info"
-msgstr "updated building info"
+msgid "update building info"
+msgstr ""
msgid "Tag Element"
msgstr "Tag Element"
@@ -29357,8 +29519,11 @@ msgstr "Area Selector"
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
-msgstr "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
+msgstr ""
msgid "Add address"
msgid_plural "Add addresses"
@@ -29470,6 +29635,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr "Debug"
@@ -33567,6 +33738,14 @@ msgstr "Printing has failed."
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -33616,6 +33795,12 @@ msgstr "How do you want to proceed?"
msgid "PT_Assistant Proceed Request"
msgstr "PT_Assistant Proceed Request"
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr "PT: Stop_position is not part of a way"
@@ -33636,6 +33821,9 @@ msgid ""
msgstr ""
"Check if route relations are compatible with public transport version 2"
+msgid "PT: Relation member roles do not match tags"
+msgstr "PT: Relation member roles do not match tags"
+
msgid "Fix error"
msgstr "Fix error"
@@ -33650,8 +33838,21 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
-msgstr "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
+msgstr ""
msgid "PT: Route should start and end with a stop_position"
msgstr "PT: Route should start and end with a stop_position"
@@ -34891,6 +35092,9 @@ msgstr "Enable Tofix plugin"
msgid "Auto delete layer"
msgstr "Auto delete layer"
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr "Select the checkbox to:"
@@ -34915,6 +35119,15 @@ msgstr "<html><a href=\"\">List of tasks</a></html>"
msgid "Select a task ..."
msgstr "Select a task ..."
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr "Set download area (m²)"
diff --git a/i18n/po/eo.po b/i18n/po/eo.po
index 1051735..21e61cc 100644
--- a/i18n/po/eo.po
+++ b/i18n/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2016-09-21 04:23+0000\n"
"Last-Translator: Yuri Tretyakov <Unknown>\n"
"Language-Team: Esperanto <eo at 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-07-03 04:40+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:41+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: eo\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2410,6 +2410,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2506,6 +2509,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2683,6 +2692,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7846,6 +7858,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7882,6 +7897,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13262,6 +13280,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14854,9 +14875,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14996,10 +15029,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15416,10 +15566,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15845,6 +15995,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27758,7 +27920,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27785,7 +27947,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27888,6 +28053,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31777,6 +31948,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31823,6 +32002,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31842,6 +32027,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31856,7 +32044,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33060,6 +33261,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33084,6 +33288,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/es.po b/i18n/po/es.po
index a4d172b..db489ca 100644
--- a/i18n/po/es.po
+++ b/i18n/po/es.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
-"PO-Revision-Date: 2017-06-30 08:47+0000\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
+"PO-Revision-Date: 2017-07-20 15:08+0000\n"
"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
"Language-Team: Spanish <es at li.org>\n"
"MIME-Version: 1.0\n"
"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-07-03 04:59+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:01+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: es\n"
"X-Language: es_ES\n"
"X-Source-Language: C\n"
@@ -2629,6 +2629,9 @@ msgstr "Sintaxis de búsqueda"
msgid "Invalid search expression"
msgstr "Expresión de búsqueda inválida"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Filtrar"
@@ -2733,6 +2736,12 @@ msgstr "todas las vías cerradas"
msgid "object without useful tags"
msgstr "objetos sin etiquetas útiles"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "metadato"
@@ -2929,6 +2938,9 @@ msgstr "Entero positivo esperado"
msgid "Range of numbers expected"
msgstr "Se esperaba un rango de números"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Elemento no esperado. Se esperaba {0} pero se encontró {1}"
@@ -8630,6 +8642,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Numero de argumentos erróneos para el marcados"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Error al leer la entrada del marcador: $s"
@@ -8670,6 +8685,9 @@ msgstr "Eliminar los marcadores actualmente seleccionados"
msgid "Rename the currently selected bookmark"
msgstr "Renombrar el marcador actualmente seleccionado"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "latitud mínima"
@@ -8787,8 +8805,8 @@ msgid ""
"data, or GPX data, or Notes, or all.</html>"
msgstr ""
"<html>Ni <strong>{0}</strong> ni <strong>{1}</strong> ni "
-"<strong>{2}</strong> están habilitados.<br>Favor de seleccionar los datos de "
-"descarga de OSM, GPX, Notas o todos.</html>"
+"<strong>{2}</strong> están habilitados.<br>Por favor, elija descargar datos "
+"OSM, GPX, notas o todos ellos.</html>"
msgid "Download referrers (parent relations)"
msgstr "Descargar referentes (relaciones padre)"
@@ -14789,6 +14807,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Leyendo información del usuario ..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Comenzando a subir en un única petición por primitiva..."
@@ -16680,9 +16701,21 @@ msgstr "Imagen Satelital Mapbox"
msgid "DigitalGlobe Premium Imagery"
msgstr "Imágenes de DigitalGlobe Premium"
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr "Imágenes de DigitalGlobe Standard"
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -16831,11 +16864,128 @@ msgstr ""
"Imágenes Sentinel-2 de la Tierra de Enderby Land y la Costa de Kemp (color "
"verdadero)"
-msgid "IGN Argentina (TMS)"
-msgstr "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
-msgid "IGN Argentina (WMS)"
-msgstr "IGN Argentina (WMS)"
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
+msgstr ""
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI blanco y negro 2.5m"
@@ -17269,11 +17419,11 @@ msgstr "Vista de Parcelas Catastrales SDFE INSPIRE"
msgid "SDFE DTK Kort25"
msgstr "SDFE DTK Kort25"
-msgid "SDFE Terræn Skyggekort (40 cm)"
-msgstr "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
+msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
-msgstr "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
+msgstr ""
msgid "SDFE Skærmkort"
msgstr "SDFE Skærmkort"
@@ -17735,6 +17885,18 @@ msgstr "Áreas de Elección de Asamblea Irlandesa de OSMIE"
msgid "OSMIE T.ie Land not in Counties"
msgstr "OSMIE T.ie Tierra que no está en condados"
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr "Lodi - Italia"
@@ -19968,10 +20130,10 @@ msgid "concrete"
msgstr "hormigón"
msgid "concrete:plates"
-msgstr "concreto:planchas"
+msgstr "hormigón: losas regulares en toda la plataforma"
msgid "concrete:lanes"
-msgstr "concreto:carriles"
+msgstr "hormigón: losas regulares solo en las bandas de rodadura"
msgid "paving_stones"
msgstr "pavimento adoquinado"
@@ -29271,6 +29433,7 @@ msgstr "aprobado"
msgid "{0} images submitted, Changeset key: {1}, State: {2}"
msgstr ""
+"se enviaron {0} imágenes, clave del conjunto de cambios: {1}, estado: {2}"
msgid "Changeset upload failed with {0} error ''{1} {2}''!"
msgstr "¡El conjunto de cambios subido falló con {0} errores ''{1} {2}''!"
@@ -29511,16 +29674,16 @@ msgid "Go forward"
msgstr "Avanzar"
msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
+msgstr "¿Qué capas de imágenes desea importar a la capa de Mapillary?"
msgid "Import"
msgstr "Importar"
msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
+msgstr "¡No se pudo importar una imagen geoetiquetada a la capa Mapillary!"
msgid "{0} ({1} images)"
-msgstr ""
+msgstr "{0} ({1} imágenes)"
msgid ""
"From which source do you want to import images to the Mapillary layer?"
@@ -30378,8 +30541,8 @@ msgstr "Origen:"
msgid "Name:"
msgstr "Nombre:"
-msgid "updated building info"
-msgstr "información del edificio actualizada"
+msgid "update building info"
+msgstr ""
msgid "Tag Element"
msgstr "Etiquetar elemento"
@@ -30406,8 +30569,11 @@ msgstr "Selector de Área"
msgid "Trying to detect an area at:"
msgstr "Tratando de detectar un área en:"
-msgid "Created area"
-msgstr "Área creada"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
+msgstr ""
msgid "Add address"
msgid_plural "Add addresses"
@@ -30526,6 +30692,12 @@ msgstr ""
"Intenta encontrar automáticamente la dirección correcta a través del "
"complemento Austria Address Helper"
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr "Depurar"
@@ -34751,6 +34923,14 @@ msgstr "La impresión ha fallado."
msgid "Repeat last fix"
msgstr "Repetir la última corrección"
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr "¿Desea hacer redonda la rotonda?"
@@ -34803,6 +34983,12 @@ msgstr "¿Cómo desea proceder?"
msgid "PT_Assistant Proceed Request"
msgstr "PT_Assistant procedió a la solicitud"
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr "PT: La posición de parada no es parte de una vía"
@@ -34826,6 +35012,10 @@ msgstr ""
"Comprobar si las relaciones de ruta son compatibles con la versión 2 del "
"transporte público"
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+"PT: Los roles de los miembros de la relación no coinciden con las etiquetas"
+
msgid "Fix error"
msgstr "Arreglar error"
@@ -34842,9 +35032,21 @@ msgstr ""
"PT: Las interrupciones de la ruta pueden disminuir ordenando los miembros. "
"Se requerirán además otras validaciones"
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
-"PT: Los roles de los miembros de la relación no coinciden con las etiquetas"
msgid "PT: Route should start and end with a stop_position"
msgstr "PT: La ruta debe empezar y terminar con una posición de parada"
@@ -36120,6 +36322,9 @@ msgstr "Activar el componente Tofix"
msgid "Auto delete layer"
msgstr "Eliminación automática de capa"
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr "Seleccione la casilla de verificación para:"
@@ -36144,6 +36349,15 @@ msgstr "<html> <a href=\"\"> Lista de tareas </a> </html>"
msgid "Select a task ..."
msgstr "Seleccionar una tarea..."
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr "Establecer el área de descarga (m²)"
@@ -38195,3 +38409,9 @@ msgstr "Ir a manejar"
msgid "Drive a race car on this layer"
msgstr "Conduce un vehículo de carreras en esta capa"
+
+#~ msgid "SDFE Overflade Skyggekort (40 cm)"
+#~ msgstr "SDFE Overflade Skyggekort (40 cm)"
+
+#~ msgid "SDFE Terræn Skyggekort (40 cm)"
+#~ msgstr "SDFE Terræn Skyggekort (40 cm)"
diff --git a/i18n/po/et.po b/i18n/po/et.po
index 10374fc..5279cef 100644
--- a/i18n/po/et.po
+++ b/i18n/po/et.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2017-02-23 08:40+0000\n"
"Last-Translator: Margus Värton <margus at dakar.ee>\n"
"Language-Team: Estonian <et at 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-07-03 04:41+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:41+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: et\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2473,6 +2473,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Vigane otsinguavaldis"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Filter"
@@ -2572,6 +2575,12 @@ msgstr ""
msgid "object without useful tags"
msgstr "ilma kasuliku sildita objektid"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "metaandmed"
@@ -2750,6 +2759,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7950,6 +7962,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7988,6 +8003,9 @@ msgstr "Kustuta valitud järjehoidjad"
msgid "Rename the currently selected bookmark"
msgstr "Nimeta ümber valitud järjehoidja"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13456,6 +13474,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Kasutajainfo lugemine ..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -15086,9 +15107,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -15228,10 +15261,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15648,10 +15798,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -16077,6 +16227,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -28009,7 +28171,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -28036,7 +28198,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -28139,6 +28304,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -32042,6 +32213,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -32088,6 +32267,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -32107,6 +32292,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -32121,7 +32309,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33325,6 +33526,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33349,6 +33553,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/eu.po b/i18n/po/eu.po
index c673015..975ffe2 100644
--- a/i18n/po/eu.po
+++ b/i18n/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2015-03-09 16:55+0000\n"
"Last-Translator: Asier Sarasua Garmendia <Unknown>\n"
"Language-Team: Basque <eu at 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-07-03 04:36+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:36+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: eu\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2490,6 +2490,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Bilaketa baliogabea"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Iragazkia"
@@ -2589,6 +2592,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2777,6 +2786,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr "Zenbaki-tarte bat espero zen"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
"Espero ez zen ezaugarria. Hauxe espero zen: {0}, hauxe aurkitu da: {1}"
@@ -8029,6 +8041,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -8065,6 +8080,9 @@ msgstr "Ezabatu aukeratutako laster-markak"
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13443,6 +13461,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -15041,9 +15062,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -15183,10 +15216,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15603,10 +15753,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -16032,6 +16182,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27985,7 +28147,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -28012,7 +28174,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -28115,6 +28280,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -32009,6 +32180,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -32055,6 +32234,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -32074,6 +32259,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -32088,7 +32276,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33292,6 +33493,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33316,6 +33520,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/fa.po b/i18n/po/fa.po
index ed10a0a..7bfde48 100644
--- a/i18n/po/fa.po
+++ b/i18n/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2014-03-18 07:32+0000\n"
"Last-Translator: Saeed Ghazi Joolaee <Unknown>\n"
"Language-Team: Persian <fa at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-03 04:55+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:57+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: fa\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2468,6 +2468,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2564,6 +2567,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2741,6 +2750,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7907,6 +7919,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7943,6 +7958,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13324,6 +13342,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14916,9 +14937,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -15058,10 +15091,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15478,10 +15628,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15907,6 +16057,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27820,7 +27982,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27847,7 +28009,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27950,6 +28115,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31839,6 +32010,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31885,6 +32064,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31904,6 +32089,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31918,7 +32106,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33122,6 +33323,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33146,6 +33350,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/fi.po b/i18n/po/fi.po
index f7f30de..faf0215 100644
--- a/i18n/po/fi.po
+++ b/i18n/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2016-01-19 17:11+0000\n"
"Last-Translator: Lauri Kytömaa <Unknown>\n"
"Language-Team: Finnish <fi at 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-07-03 04:42+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:42+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: fi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2585,6 +2585,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Virhe hakulausekkeessa"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Suodin"
@@ -2684,6 +2687,12 @@ msgstr "kaikki suljetut polut"
msgid "object without useful tags"
msgstr "Kohteet joilla ei ole yhtään merkityksellistä tagia"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "metadata"
@@ -2873,6 +2882,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr "Odotettiin lukuväliä"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Odottamaton symboli. Odotettu {0}, löydetty {1}"
@@ -8299,6 +8311,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Kirjanmerkillä on väärä määrä parametreja"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Virhe luettaessa kirjanmerkkiä: %s"
@@ -8338,6 +8353,9 @@ msgstr "Poista valitut kirjanmerkit"
msgid "Rename the currently selected bookmark"
msgstr "Nimeä valitut kirjanmerkit uudelleen"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "eteläisin leveysp."
@@ -14043,6 +14061,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Aloitaan lähetys yksi objekti kerrallaan ..."
@@ -15708,9 +15729,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -15850,10 +15883,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -16270,10 +16420,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -16699,6 +16849,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -28681,7 +28843,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -28708,7 +28870,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -28813,6 +28978,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -32761,6 +32932,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -32807,6 +32986,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -32826,6 +33011,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -32840,7 +33028,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -34048,6 +34249,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -34072,6 +34276,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/fil.po b/i18n/po/fil.po
index d2b4756..7636b54 100644
--- a/i18n/po/fil.po
+++ b/i18n/po/fil.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2011-06-19 14:15+0000\n"
"Last-Translator: Anthony Balico <Unknown>\n"
"Language-Team: Filipino <fil at 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-07-03 05:07+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:09+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: fil\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2403,6 +2403,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2499,6 +2502,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2676,6 +2685,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7839,6 +7851,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7875,6 +7890,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13251,6 +13269,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14843,9 +14864,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14985,10 +15018,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15405,10 +15555,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15834,6 +15984,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27747,7 +27909,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27774,7 +27936,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27877,6 +28042,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31766,6 +31937,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31812,6 +31991,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31831,6 +32016,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31845,7 +32033,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33049,6 +33250,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33073,6 +33277,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/fo.po b/i18n/po/fo.po
index 47799f1..5e5e6d7 100644
--- a/i18n/po/fo.po
+++ b/i18n/po/fo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2015-02-28 16:15+0000\n"
"Last-Translator: LiFo <Unknown>\n"
"Language-Team: Faroese <fo at 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-07-03 04:41+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:42+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}: valmøguleiki ''{1}'' er tvítýddur"
@@ -2402,6 +2402,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2498,6 +2501,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2675,6 +2684,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7838,6 +7850,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7874,6 +7889,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13250,6 +13268,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14842,9 +14863,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14984,10 +15017,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15404,10 +15554,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15833,6 +15983,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27746,7 +27908,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27773,7 +27935,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27876,6 +28041,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31765,6 +31936,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31811,6 +31990,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31830,6 +32015,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31844,7 +32032,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33048,6 +33249,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33072,6 +33276,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/fr.po b/i18n/po/fr.po
index ed02171..e74569e 100644
--- a/i18n/po/fr.po
+++ b/i18n/po/fr.po
@@ -5,16 +5,16 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
-"PO-Revision-Date: 2017-06-27 18:40+0000\n"
-"Last-Translator: Don-vip <Unknown>\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
+"PO-Revision-Date: 2017-07-29 15:39+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Fr <>\n"
"MIME-Version: 1.0\n"
"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-07-03 04:43+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:43+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: fr\n"
"X-Poedit-Bookmarks: -1,-1,-1,2669,-1,-1,-1,-1,-1,-1\n"
@@ -2625,6 +2625,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "L’expression de recherche n’est pas valide"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Filtrer"
@@ -2729,6 +2732,12 @@ msgstr "tous les chemins fermés"
msgid "object without useful tags"
msgstr "objet sans attribut utile"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "métadonnées"
@@ -2925,6 +2934,9 @@ msgstr "Entier positif attendu"
msgid "Range of numbers expected"
msgstr "Série de nombres attendus"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Jeton inattendu. Attendu {0}, trouvé {1}"
@@ -4618,7 +4630,7 @@ msgid "Role ''{0}'' unknown in templates ''{1}''"
msgstr "Le rôle ''{0}'' est inconnu dans les modèles ''{1}''"
msgid "Empty role type found when expecting one of ''{0}''"
-msgstr "Rôle vide trouvé au lieu un de ''{0}'' attendu"
+msgstr "Rôle vide trouvé alors qu’un rôle de ''{0}'' est attendu"
msgid "Role ''{0}'' missing"
msgstr "Rôle \"{0}\" manquant"
@@ -5571,7 +5583,7 @@ msgid " ({0})"
msgstr " ({0})"
msgid "<h2>Filter active: {0}</h2>"
-msgstr ""
+msgstr "<h2>Filtre actif: {0}</h2>"
msgid "</p><p>Click again on filter button to see all objects.</p></html>"
msgstr ""
@@ -6919,7 +6931,7 @@ msgid "layer is currently visible (click to hide layer)"
msgstr "le calque est actuellement affiché (cliquer pour le masquer)"
msgid "layer is currently hidden (click to show layer)"
-msgstr "le claque est actuellement masqué (cliquer pour l’afficher)"
+msgstr "le calque est actuellement masqué (cliquer pour l’afficher)"
msgid "this layer is the active layer"
msgstr "ce calque est le calque actif"
@@ -8557,6 +8569,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Le nombre d’argument n’est pas valide pour le signet"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Une erreur est survenue lors de la lecture du signet : %s"
@@ -8594,6 +8609,9 @@ msgstr "Supprimer le signet"
msgid "Rename the currently selected bookmark"
msgstr "Renommer le signet"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "Latitude minimale :"
@@ -10734,7 +10752,7 @@ msgid "Velocity, {0}"
msgstr "Vélocité, {0}"
msgid "Audio files (*.wav, *.mp3, *.aac, *.aif, *.aiff)"
-msgstr ""
+msgstr "Fichiers audio (*.wav, *.mp3, *.aac, *.aif, *.aiff)"
msgid "Import Audio"
msgstr "Importer des sons"
@@ -14700,6 +14718,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Lecture des informations sur l’utilisateur…"
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Début de l’envoi des données avec une requête par objet…"
@@ -16603,9 +16624,21 @@ msgstr "Satellite Mapbox"
msgid "DigitalGlobe Premium Imagery"
msgstr "Imagerie Premium DigitalGlobe"
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr "Imagerie Standart DigitalGlobe"
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -16753,11 +16786,128 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
-msgstr "IGN Argentine (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
-msgid "IGN Argentina (WMS)"
-msgstr "IGN Argentina (WMS)"
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
+msgstr ""
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI noir et blanc 2.5 m"
@@ -16897,13 +17047,13 @@ msgid "URBISfr numerical imagery (2013)"
msgstr "Imagerie numérique URBISfr (2013)"
msgid "URBISfr numerical imagery"
-msgstr "URBISfr"
+msgstr "Imagerie numérique URBISfr"
msgid "URBISnl numerical imagery (2013)"
msgstr "Imagerie numérique URBISnl (2013)"
msgid "URBISnl numerical imagery"
-msgstr "URBISnl Imagerie numérique"
+msgstr "Imagerie numérique URBISnl"
msgid "URBIS 2009 aerial imagery"
msgstr "Imagerie aérienne URBIS 2009"
@@ -16918,7 +17068,7 @@ msgid "URBIS 2015 aerial imagery"
msgstr "Imagerie aérienne URBIS 2015"
msgid "URBIS 2016 aerial imagery"
-msgstr "URBIS 2016 Imagerie aérienne"
+msgstr "Imagerie aérienne URBIS 2016"
msgid "SPW(allonie) PICC numerical imagery"
msgstr "Imagerie numérique SPW(allonie) PICC"
@@ -16961,13 +17111,13 @@ msgstr ""
"vraie)"
msgid "IBGE Map of urban areas"
-msgstr ""
+msgstr "IBGE Carte des zones urbaines"
msgid "IBGE Map of rural areas"
-msgstr ""
+msgstr "IBGE Carte des zones rurales"
msgid "IBGE federal district"
-msgstr ""
+msgstr "IBGE District fédéral"
msgid "Addresses data from IBGE"
msgstr "Données d’adresses de IBGE"
@@ -17051,7 +17201,7 @@ msgid "Viçosa AL"
msgstr "Viçosa AL"
msgid "Alagoas coast 2006"
-msgstr ""
+msgstr "Littoral de L’Alagoas 2006"
msgid "DER-ES"
msgstr "DER-ES"
@@ -17177,7 +17327,7 @@ msgid "Praha IPR low-vegetation orthophoto"
msgstr ""
msgid "SDFE aerial imagery"
-msgstr ""
+msgstr "Imagerie aérienne SDFE"
msgid "SDFE Cadastral Parcels INSPIRE View"
msgstr ""
@@ -17185,17 +17335,17 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
-msgstr "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
+msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
-msgstr "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
+msgstr ""
msgid "SDFE Skærmkort"
msgstr ""
msgid "Stevns"
-msgstr ""
+msgstr "Stevns"
msgid "Vejmidte"
msgstr ""
@@ -17618,6 +17768,18 @@ msgstr "Zone d''élection Dail OSMIE"
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr "Lodi - Italie"
@@ -28926,10 +29088,10 @@ msgid "Current Mapillary changeset"
msgstr ""
msgid "Open Mapillary changeset dialog"
-msgstr ""
+msgstr "Ouvrir la boite de dialogue des modifications Mapillary"
msgid "Mapillary changeset"
-msgstr ""
+msgstr "Modifications Mapillary"
msgid "Submitting changeset to server…"
msgstr "Envoyer les modifications au serveur ..."
@@ -29087,7 +29249,7 @@ msgid "Preview images when hovering its icon"
msgstr "Aperçu des images lors du survol de l’icône"
msgid "Cut off sequences at download bounds"
-msgstr ""
+msgstr "Couper les séquences aux limites de téléchargement"
msgid "Enable experimental beta-features (might be unstable)"
msgstr ""
@@ -29153,7 +29315,7 @@ msgid "Select the images you want to import"
msgstr "Sélectionnez les images que vous souhaitez importer"
msgid "All images in a directory"
-msgstr ""
+msgstr "Toutes les images dans un répertoire"
msgid "Select directory to import images from"
msgstr "Sélectionnez le répertoire pour importer des images de"
@@ -29975,8 +30137,8 @@ msgstr ""
msgid "Name:"
msgstr "Nom :"
-msgid "updated building info"
-msgstr "mise à jour des informations sur les bâtiments"
+msgid "update building info"
+msgstr ""
msgid "Tag Element"
msgstr "Ajouter des attributs à l’élément"
@@ -30004,8 +30166,11 @@ msgstr "Sélecteur d’aire"
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
-msgstr "Zone créée"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
+msgstr ""
msgid "Add address"
msgid_plural "Add addresses"
@@ -30124,6 +30289,12 @@ msgstr ""
"Essayez automatiquement de trouver l’adresse correcte via le plugin Austria "
"Address Helper"
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr "Débogueur"
@@ -34306,6 +34477,14 @@ msgstr "L’’impression a échoué."
msgid "Repeat last fix"
msgstr "Répéter la dernière correction"
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -34355,6 +34534,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -34376,6 +34561,10 @@ msgstr ""
"Vérifiez si les relations de route sont compatibles avec les "
"public_transport:version 2"
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+"PT: Les rôles des membres de la relations ne correspondent pas aux tags"
+
msgid "Fix error"
msgstr "Correction d’erreur"
@@ -34390,9 +34579,21 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
-"PT: Les rôles des membres de la relations ne correspondent pas aux tags"
msgid "PT: Route should start and end with a stop_position"
msgstr "PT: l’itinéraire doit commencer et se terminer par stop_position"
@@ -35676,6 +35877,9 @@ msgstr "Activer le plugin Tofix"
msgid "Auto delete layer"
msgstr "Supprimer automatiquement le calque"
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr "Sélectionnez la case à cocher pour:"
@@ -35700,6 +35904,15 @@ msgstr "<html><a href=\"\">Liste des tâches</a></html>"
msgid "Select a task ..."
msgstr "Sélectionne une tâche..."
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr "Régler la zone de téléchargement (m²)"
@@ -37781,3 +37994,9 @@ msgstr "En voiture !"
msgid "Drive a race car on this layer"
msgstr "Conduire une voiture de course sur ce calque"
+
+#~ msgid "SDFE Terræn Skyggekort (40 cm)"
+#~ msgstr "SDFE Terræn Skyggekort (40 cm)"
+
+#~ msgid "SDFE Overflade Skyggekort (40 cm)"
+#~ msgstr "SDFE Overflade Skyggekort (40 cm)"
diff --git a/i18n/po/ga.po b/i18n/po/ga.po
index 77144ec..0d2d403 100644
--- a/i18n/po/ga.po
+++ b/i18n/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2015-05-17 11:43+0000\n"
"Last-Translator: Thorsten <Unknown>\n"
"Language-Team: Irish <ga at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-07-03 04:44+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:44+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -2402,6 +2402,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2498,6 +2501,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2675,6 +2684,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7838,6 +7850,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7874,6 +7889,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13250,6 +13268,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14842,9 +14863,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14984,10 +15017,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15404,10 +15554,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15833,6 +15983,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27746,7 +27908,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27773,7 +27935,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27876,6 +28041,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31765,6 +31936,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31811,6 +31990,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31830,6 +32015,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31844,7 +32032,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33048,6 +33249,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33072,6 +33276,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/gl.po b/i18n/po/gl.po
index f0538fb..ba9c296 100644
--- a/i18n/po/gl.po
+++ b/i18n/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2016-01-01 15:11+0000\n"
"Last-Translator: Marcos Lans <Unknown>\n"
"Language-Team: Galician <proxecto at trasno.net>\n"
@@ -16,8 +16,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-07-03 04:44+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:45+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: gl\n"
"X-Poedit-Language: Galician\n"
@@ -2556,6 +2556,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Expresión de procura inválida"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Filtrar"
@@ -2655,6 +2658,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2840,6 +2849,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr "Rango de numeros esperado"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Elemento non esperado. Esperábase {0} mais atopouse {1}"
@@ -8170,6 +8182,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -8208,6 +8223,9 @@ msgstr "Retirar os marcadores seleccionados"
msgid "Rename the currently selected bookmark"
msgstr "Renomear o marcador escollido"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "lat. min."
@@ -13730,6 +13748,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Lendo información de usuario…"
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Comezando a subir con unha petición por primitiva…"
@@ -15365,9 +15386,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -15507,10 +15540,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15927,10 +16077,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -16356,6 +16506,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -28303,7 +28465,7 @@ msgstr ""
msgid "Name:"
msgstr "Nome:"
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -28330,7 +28492,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -28433,6 +28598,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -32348,6 +32519,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -32394,6 +32573,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -32413,6 +32598,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -32427,7 +32615,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33633,6 +33834,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33657,6 +33861,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/he.po b/i18n/po/he.po
index 5bb9bd5..1bc1c55 100644
--- a/i18n/po/he.po
+++ b/i18n/po/he.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2017-06-04 17:31+0000\n"
"Last-Translator: SwiftFast <Unknown>\n"
"Language-Team: Hebrew <he at 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-07-03 04:45+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:46+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: he\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2413,6 +2413,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2509,6 +2512,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2689,6 +2698,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7867,6 +7879,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7903,6 +7918,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "רוחב מזערי"
@@ -13292,6 +13310,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14886,9 +14907,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -15028,10 +15061,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15448,10 +15598,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15877,6 +16027,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27790,7 +27952,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27817,7 +27979,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27920,6 +28085,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31813,6 +31984,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31859,6 +32038,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31878,6 +32063,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31892,7 +32080,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33096,6 +33297,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33120,6 +33324,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/hi.po b/i18n/po/hi.po
index c503092..5d3c96d 100644
--- a/i18n/po/hi.po
+++ b/i18n/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2009-11-14 16:28+0000\n"
"Last-Translator: nipunreddevil <nipunreddevil at gmail.com>\n"
"Language-Team: Hindi <hi at 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-07-03 04:46+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:46+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: hi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2403,6 +2403,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2499,6 +2502,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2676,6 +2685,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7839,6 +7851,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7875,6 +7890,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13251,6 +13269,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14843,9 +14864,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14985,10 +15018,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15405,10 +15555,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15834,6 +15984,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27747,7 +27909,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27774,7 +27936,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27877,6 +28042,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31766,6 +31937,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31812,6 +31991,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31831,6 +32016,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31845,7 +32033,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33049,6 +33250,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33073,6 +33277,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/hr.po b/i18n/po/hr.po
index 852ed9a..6e4cb68 100644
--- a/i18n/po/hr.po
+++ b/i18n/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2016-01-04 15:56+0000\n"
"Last-Translator: gogo <trebelnik2 at gmail.com>\n"
"Language-Team: Croatian <hr at 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: 2017-07-03 04:58+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:00+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: hr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2490,6 +2490,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Filter"
@@ -2586,6 +2589,12 @@ msgstr "svi zatvoreni putevi"
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "metapodaci"
@@ -2763,6 +2772,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr "Očekivani raspon brojeva"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Neočekivani simbol. Očekivani {0}, pronađeni {1}"
@@ -7961,6 +7973,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7997,6 +8012,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13401,6 +13419,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14993,9 +15014,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -15135,10 +15168,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15555,10 +15705,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15984,6 +16134,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27897,7 +28059,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27924,7 +28086,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -28027,6 +28192,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31920,6 +32091,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31966,6 +32145,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31985,6 +32170,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31999,7 +32187,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33203,6 +33404,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33227,6 +33431,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/ht.po b/i18n/po/ht.po
index 5002d85..c7f97dc 100644
--- a/i18n/po/ht.po
+++ b/i18n/po/ht.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2010-03-11 21:17+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Haitian; Haitian Creole <ht at 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-07-03 04:45+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:46+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2403,6 +2403,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2499,6 +2502,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2676,6 +2685,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7839,6 +7851,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7875,6 +7890,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13251,6 +13269,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14843,9 +14864,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14985,10 +15018,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15405,10 +15555,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15834,6 +15984,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27747,7 +27909,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27774,7 +27936,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27877,6 +28042,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31766,6 +31937,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31812,6 +31991,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31831,6 +32016,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31845,7 +32033,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33049,6 +33250,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33073,6 +33277,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/hu.po b/i18n/po/hu.po
index 0ef456c..b5e97fb 100644
--- a/i18n/po/hu.po
+++ b/i18n/po/hu.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
-"PO-Revision-Date: 2017-05-27 22:06+0000\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
+"PO-Revision-Date: 2017-07-25 15:13+0000\n"
"Last-Translator: Gábor Babos <Unknown>\n"
"Language-Team: Hungarian <kde-l10n-hu at kde.org>\n"
"MIME-Version: 1.0\n"
"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-07-03 04:46+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:47+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: hu\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -146,7 +146,7 @@ msgid "Plugins"
msgstr "Bővítmények"
msgid "About JOSM..."
-msgstr "A JOSM névjegye..."
+msgstr "A JOSM névjegye…"
msgid "OK"
msgstr "OK"
@@ -216,10 +216,11 @@ msgstr "Kijelölés"
msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
-"A térképen kijelölt elemeket beállítása a fenti listában kijelölt tétekelekre"
+"A térképen kijelölt elemeket beállítása a fenti listában kijelölt "
+"tétekelekre."
msgid "Select WMS layers"
-msgstr "WMS rétegek kijelölése"
+msgstr "WMS-rétegek kijelölése"
msgid "Add layers"
msgstr "Rétegek hozzáadása"
@@ -246,7 +247,7 @@ msgid "Select image format for WMS layer"
msgstr "Képformátum kijelölése a WMS réteghez"
msgid "Add Node..."
-msgstr "Pont hozzáadása..."
+msgstr "Pont hozzáadása…"
msgid "Add a node by entering latitude / longitude or easting / northing."
msgstr ""
@@ -337,13 +338,13 @@ msgid "View: {0}"
msgstr "Nézet: {0}"
msgid "No conflicts to zoom to"
-msgstr "Nincs ütközés, amire rá lehetne közelíteni."
+msgstr "Nincs ütközés, amire rá lehetne közelíteni"
msgid "Changeset Manager"
-msgstr "Változás követő"
+msgstr "Módosításcsomag-kezelő"
msgid "Toggle visibility of Changeset Manager window"
-msgstr "Változás követő ablak be- illetve kikapcsolása"
+msgstr "Módosításcsomag-kezelő ablak be- illetve kikapcsolása"
msgid "Close open changesets"
msgstr "Nyitott módosításcsomagok lezárása"
@@ -355,13 +356,13 @@ msgid "File: {0}"
msgstr "Fájl: {0}"
msgid "There are no open changesets"
-msgstr "Nincsenek nyitott módosításcsomagok"
+msgstr "Nincs nyitott módosításcsomag"
msgid "No open changesets"
-msgstr "Nincsenek nyitott módosításcsomagok"
+msgstr "Nincs nyitott módosításcsomag"
msgid "Downloading open changesets ..."
-msgstr "Nyitott módosításcsomagok letöltése ..."
+msgstr "Nyitott módosításcsomagok letöltése…"
msgid "Combine Way"
msgstr "Vonalak egyesítése"
@@ -475,11 +476,11 @@ msgid ""
"* Three nodes."
msgstr ""
"Jelölj ki :\n"
-"* egy önmagát nem keresztező szakaszt, vagy a szakasz két pontját\n"
-"* legalább 3 pontot"
+"* egy önmagát nem keresztező szakaszt, vagy a szakasz két pontját;\n"
+"* legalább 3 pontot."
msgid "Download from OSM..."
-msgstr "Letöltés OSM-ről..."
+msgstr "Letöltés OSM-ről…"
msgid "Download map data from the OSM server."
msgstr "Térképadatok letöltése az OSM kiszolgálóról."
@@ -507,19 +508,19 @@ msgid "Download object..."
msgstr "Objektumok letöltése…"
msgid "Download OSM object by ID."
-msgstr "OSM objektumok letöltése ID alapján"
+msgstr "OSM objektumok letöltése ID alapján."
msgid "Download parent ways/relations..."
-msgstr "Szülővolalak/-kapcsolatok letöltése..."
+msgstr "Szülővolalak/-kapcsolatok letöltése…"
msgid "Download objects referring to one of the selected objects"
-msgstr "Az egyik kijelölt objektumra hivatkozó objektumok letöltése."
+msgstr "Az egyik kijelölt objektumra hivatkozó objektumok letöltése"
msgid "Duplicate"
msgstr "Kettőzés"
msgid "Duplicate selection."
-msgstr "Kijelölés duplikálása"
+msgstr "Kijelölés duplikálása."
msgid "Exit"
msgstr "Kilépés"
@@ -551,13 +552,13 @@ msgid "Toggle fullscreen view"
msgstr "Teljes képernyős nézet be- illetve kikapcsolása"
msgid "Export to GPX..."
-msgstr "Exportálás GPX formátumba..."
+msgstr "Exportálás GPX formátumba…"
msgid "Export the data to GPX file."
msgstr "Adatok exportálása GPX fájlba."
msgid "Nothing to export. Get some data first."
-msgstr "Nincs mit exportálni. Először szerezz néhány adatot."
+msgstr "Nincs mit exportálni. Először szerezz adatokat."
msgid "Export GPX file"
msgstr "GPX fájl exportálása"
@@ -567,7 +568,7 @@ msgstr "Előzmények"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
-"Történeti információ megjelenítése OSM pontokról, vonalakról vagy "
+"Előzményinformációk megjelenítése OSM pontokról, vonalakról vagy "
"kapcsolatokról."
msgid "Show history"
@@ -645,7 +646,7 @@ msgstr ""
msgid ""
"One of the selected ways is not closed and therefore cannot be joined."
-msgstr "Az egyik kiválasztott vonal nem zárt, ezért nem kapcsolható össze"
+msgstr "Az egyik kijelölt vonal nem zárt, ezért nem kapcsolható össze."
msgid "Join area confirmation"
msgstr "Területek összekapcsolásának megerősítése"
@@ -753,7 +754,8 @@ msgid "Move Node onto Way"
msgstr "Pont mozgatása vonalra"
msgid "Move the node onto the nearest way segments and include it"
-msgstr "Mozgasd a pontot a legközelebbi vonalrészre és egyesítsd vele."
+msgstr ""
+"A pontot mozgatása a legközelebbi vonalszakaszra, és vele való egyesítése"
msgid "No Shortcut"
msgstr "Nincs billentyűparancs"
@@ -763,13 +765,13 @@ msgstr "Ugrás a pozicióba"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
-"Megnyit egy párbeszédablakot amelyben egy megadott helyre lehet ugrani"
+"Megnyit egy párbeszédablakot amellyel egy konkrét helyre lehet ugrani"
msgid "Jump to Position"
msgstr "Ugrás a Pozícióra"
msgid "Enter Lat/Lon to jump to position."
-msgstr "Ugrás a megadott szélessági/hoszúsági pozicióba"
+msgstr "A pozícióra ugráshoz add meg a szélességi/hosszúsági fokokat."
msgid "You can also paste an URL from www.openstreetmap.org"
msgstr "A www.openstreetmap.org oldalról is bemásolható egy URL"
@@ -795,7 +797,7 @@ msgstr ""
"Kérjük, ellenőrizze."
msgid "Unable to parse Lon/Lat"
-msgstr "Nem lehet feldolgozni a szélesség, vagy a hosszúság értéket."
+msgstr "Nem lehet feldolgozni a szélességi/hosszúsági értéket"
msgid "Lasso Mode"
msgstr "Lasszó mód"
@@ -806,7 +808,7 @@ msgstr ""
"belül"
msgid "Rectified Image..."
-msgstr "Transzformált kép..."
+msgstr "Transzformált kép…"
msgid "Download Rectified Images From Various Services"
msgstr "Transzformált képek letöltése különböző forrásokból"
@@ -824,7 +826,7 @@ msgid "Visit Homepage"
msgstr "Honlap megnyitása"
msgid "WMS URL or Image ID:"
-msgstr "WMS URL vagy kép ID"
+msgstr "WMS URL vagy kép ID:"
msgid "Add Rectified Image"
msgstr "Transzformált kép betöltése"
@@ -846,7 +848,7 @@ msgid "Merge the current layer into another layer"
msgstr "A jelenlegi réteg egyesítése egy másik réteggel"
msgid "{0} completed in {1}"
-msgstr "{0} elkészült {1} alatt"
+msgstr "{0} elkészült ennyi idő alatt: {1}"
msgid "Merging layers with different upload policies"
msgstr "Különböző feltöltési szabályú rétegek egyesítése"
@@ -894,7 +896,7 @@ msgid ""
"Cannot merge nodes: Would have to delete way {0} which is still used by {1}"
msgstr ""
"A pontok nem egyesíthetők: ehhez törölni kellene a(z) {0} vonalat, amelyet "
-"viszont még a(z) {1} használ."
+"viszont még használ a következő: {1}"
msgid "Merge {0} node"
msgid_plural "Merge {0} nodes"
@@ -955,7 +957,7 @@ msgid "Cannot move objects outside of the world."
msgstr "Az objektumokat nem lehet a világon kívülre mozgatni."
msgid "Move Node..."
-msgstr "Pont mozgatása ..."
+msgstr "Pont mozgatása…"
msgid "Edit latitude and longitude of a node."
msgstr "Pont szélesség, vagy a hosszúság értékének szerkesztése."
@@ -1011,11 +1013,11 @@ msgstr "Fájl megnyitása"
msgid "Opening {0} file..."
msgid_plural "Opening {0} files..."
-msgstr[0] "{0} fájl megnyitása..."
-msgstr[1] "{0} fájlok megnyitása..."
+msgstr[0] "{0} fájl megnyitása…"
+msgstr[1] "{0} fájlok megnyitása…"
msgid "Opening file ''{0}'' ..."
-msgstr "\"{0}\" fájl megnyitása..."
+msgstr "\"{0}\" fájl megnyitása…"
msgid "Which tasks to perform?"
msgstr "Melyik feladatokat kívánod végrehajtani?"
@@ -1130,7 +1132,7 @@ msgstr ""
"be."
msgid "Download from Overpass API ..."
-msgstr "Letöltés Overpass API-ról ..."
+msgstr "Letöltés Overpass API-ról…"
msgid "Download map data from Overpass API server."
msgstr "Térképadatok letöltése az Overpass API kiszolgálóról."
@@ -1183,7 +1185,7 @@ msgid "Preferences"
msgstr "Beállítások"
msgid "Purge..."
-msgstr "Elfelejtés..."
+msgstr "Elfelejtés…"
msgid "Forget objects but do not delete them on server when uploading."
msgstr ""
@@ -1231,7 +1233,7 @@ msgid "Redo the last undone action."
msgstr "A legutóbb visszavont művelet újbóli végrehajtása."
msgid "Redo ..."
-msgstr "Újra ..."
+msgstr "Újra…"
msgid "Redo {0}"
msgstr "Újra {0}"
@@ -1243,7 +1245,7 @@ msgid "Also rename the file"
msgstr "Fájl átnevezése szintén"
msgid "Could not rename file ''{0}''"
-msgstr "Nem lehet átnevezni a(z) \"{0}\" fájlt"
+msgstr "Nem lehet átnevezni a következő fájlt: \"{0}\""
msgid "Report a ticket to JOSM bugtracker"
msgstr "Hibajegy felvétele a JOSM hibakövetőjébe"
@@ -1331,7 +1333,7 @@ msgid "Open session"
msgstr "Munkamenet megnyitása"
msgid "Loading session ''{0}''"
-msgstr "''{0}'' munkamenet betöltése"
+msgstr "A következő munkamenet betöltése: ''{0}''"
msgid "Data Error"
msgstr "Adat hiba"
@@ -1344,10 +1346,10 @@ msgstr ""
"<html>''{0}'' munkamenet fájl betöltése sikertelen.<br>Hiba:<br>{1}</html>"
msgid "Save Session As..."
-msgstr "Munkamenet mentése mint..."
+msgstr "Munkamenet mentése mint…"
msgid "Save the current session to a new file."
-msgstr "Aktuális munkamenet mentése új fájlba"
+msgstr "Aktuális munkamenet mentése új fájlba."
msgid "Session file (archive) (*.joz)"
msgstr "Munkamenet fájl (archívum) (*.joz)"
@@ -1408,7 +1410,7 @@ msgid "Yes"
msgstr "Igen"
msgid "Simplify all selected ways"
-msgstr "A kijelölt vonalak egyszerűsítése"
+msgstr "Minden kijelölt vonal egyszerűsítése"
msgid "Cancel operation"
msgstr "Művelet megszakítása"
@@ -1470,7 +1472,7 @@ msgid " [id: {0}]"
msgstr " [id: {0}]"
msgid "Segment {0}: {1}"
-msgstr "szakasz {0}: {1}"
+msgstr "Szakasz {0}: {1}"
msgid "You must select two or more nodes to split a circular way."
msgstr "Körvonalat csak kettő vagy több pont kijelölésével lehet felosztani."
@@ -1634,7 +1636,7 @@ msgstr "Jelölj ki legalább egy leválasztandó pontot."
msgid "Selected node cannot be disconnected from anything."
msgid_plural "Selected nodes cannot be disconnected from anything."
msgstr[0] "A kijelölt pont nem választható le sehonnan."
-msgstr[1] "A kijelölt pontok nem választhatóak le sehonnan."
+msgstr[1] "A kijelölt pontok nem választhatók le sehonnan."
msgid ""
"The affected way would disappear after disconnecting the selected node."
@@ -1653,7 +1655,7 @@ msgid "Undo the last action."
msgstr "Visszavonja a legutóbb végrehajtott műveletet."
msgid "Undo ..."
-msgstr "Visszavonás ..."
+msgstr "Visszavonás…"
msgid "Undo {0}"
msgstr "{0} visszavonása"
@@ -1775,7 +1777,7 @@ msgid "Test {0}/{1}: Starting {2}"
msgstr "Ellenőrzés: {0}/{1}: Kezdés: {2}"
msgid "Updating ignored errors ..."
-msgstr "Mellőzött hibák frissítése ..."
+msgstr "Mellőzött hibák frissítése…"
msgid "Viewport Following"
msgstr "Rajzolás követése"
@@ -1891,22 +1893,22 @@ msgid "Downloading changeset content"
msgstr "Módosításcsomag-tartalom letöltése"
msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) {2} módosításcsomag letöltése..."
+msgstr "({0}/{1}) {2} módosításcsomag letöltése…"
msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) {2} módosításcsomag tartalmának letöltése..."
+msgstr "({0}/{1}) {2} módosításcsomag tartalmának letöltése…"
msgid "Download changesets"
-msgstr "Módosításcsomag letöltése"
+msgstr "Módosításcsomagok letöltése"
msgid "Querying and downloading changesets"
msgstr "Módosításcsomagok lekérdezése és letöltése"
msgid "Determine user id for current user..."
-msgstr "Jelenlegi felhasználó azonosítójának megállapítása..."
+msgstr "Jelenlegi felhasználó azonosítójának megállapítása…"
msgid "Query and download changesets ..."
-msgstr "Módosításcsomag lekérdezés és letöltés"
+msgstr "Módosításcsomagok lekérdezése és letöltése…"
msgid "Errors during download"
msgstr "Hibák letöltés közben"
@@ -1915,7 +1917,7 @@ msgid "Download GPS"
msgstr "GPS letöltése"
msgid "Downloading GPS data"
-msgstr "GPS adatok letöltése"
+msgstr "GPS-adatok letöltése"
msgid "Downloaded GPX Data"
msgstr "Letöltött GPX adatok"
@@ -1980,7 +1982,7 @@ msgstr ""
"{0}"
msgid "No data found in this area."
-msgstr "Nem található adat ebben a tartományban."
+msgstr "Ezen a területen nincs adat."
msgid "OSM Server URL:"
msgstr "OSM kiszolgáló URL:"
@@ -2197,13 +2199,13 @@ msgid "Disable"
msgstr "Kikapcsolás"
msgid "0,90,..."
-msgstr "0,90,..."
+msgstr "0, 90…"
msgid "0,45,90,..."
-msgstr "0,45,90,..."
+msgstr "0, 45, 90…"
msgid "0,30,45,60,90,..."
-msgstr "0,30,45,60,90,..."
+msgstr "0, 30, 45, 60, 90…"
msgid "FIX"
msgstr "FIX"
@@ -2271,7 +2273,7 @@ msgid "Click on the way to start improving its shape."
msgstr "Kattints a vonalra az alak javításának megkezdéséhez"
msgid "Select a way that you want to make more accurate."
-msgstr "Válassz egy vonalat, amit pontosabbá szeretnél tenni"
+msgstr "Jelöld ki azt a vonalat, amelyet pontosabbá szeretnél tenni."
msgid ""
"Click to add a new node. Release Ctrl to move existing nodes or hold Alt to "
@@ -2339,7 +2341,7 @@ msgstr ""
"lejátszásához; SHIFT+elengedés szinkronizálja a hangot a ponthoz."
msgid "Select, move, scale and rotate objects"
-msgstr "Objektumokat kiválaszt, mozgat, átméretez és forgat"
+msgstr "Objektumok kijelölése, mozgatása, átméretezés és forgatása"
msgid ""
"Are you sure that you want to move elements with attached ways that are "
@@ -2392,7 +2394,7 @@ msgid ""
"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
"Ctrl to rotate selected; Alt-Ctrl to scale selected; or change selection"
msgstr ""
-"Objektumok mozgatása húzással. Shift: kiválasztáshoz adás; Ctrl kiválasztás "
+"Objektumok mozgatása húzással. Shift: kijelöléshez adás; Ctrl kijelölés "
"változtatása; Shift+Ctrl: kijelöltek forgatása; Alt+Ctrl: kijelöltek "
"átméretezése"
@@ -2419,20 +2421,22 @@ msgstr ""
"Összes, az adathalmazban kijelölt objektum hozzáadása az utolsó tag után"
msgid "Add selection to relation"
-msgstr "Kiválasztott elemek kapcsolathoz adása"
+msgstr "Kijelölt elemek kapcsolathoz adása"
msgid ""
"{0}Add selection to relation{1}: Verify every single relation to avoid "
"damage!"
msgstr ""
+"{0}Kijelölés hozzáadása {1} kapcsolathoz: A károk elkerülése érdekében "
+"ellenőrizz minden egyes kapcsolatot!"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
-msgstr[0] "Kiválasztott elemek {0} kapcsolathoz adása"
-msgstr[1] "Kiválasztott elemek {0} kapcsolathoz adása"
+msgstr[0] "Kijelölés hozzáadása {0} kapcsolathoz"
+msgstr[1] "Kijelölés hozzáadása {0} kapcsolathoz"
msgid "Delete the selected relation"
-msgstr "Törli a kiválasztott kapcsolatot"
+msgstr "Törli a kijelölt kapcsolatot"
msgid "Download all members of the selected relations"
msgstr "A kijelölt kapcsolatok összes tagjának letöltése"
@@ -2482,34 +2486,34 @@ msgid "Relation Editor: {0}"
msgstr "Kapcsolat szerkesztő: {0}"
msgid "Select in relation list"
-msgstr "Kijelölés a kapcsolat listában"
+msgstr "Kijelölés a kapcsolatlistában"
msgid "Select relation in relation list."
-msgstr "Kapcsolat kijelölése a kapcsolat listában"
+msgstr "Kapcsolat kijelölése a kapcsolatlistában"
msgid "Add the members of all selected relations to current selection"
-msgstr "A kijelölt kapcsolatok tagjainak hozzáadása a kiválasztáshoz"
+msgstr "A kijelölt kapcsolatok tagjainak hozzáadása a kijelöléshez"
msgid "Select the members of all selected relations"
-msgstr "A kijelölt kapcsolatok tagjainak kiválasztása"
+msgstr "Az összes kijelölt kapcsolat tagjainak kijelölése"
msgid "Select members (add)"
-msgstr "Tagok kiválasztása (hozzáadás)"
+msgstr "Tagok kijelölése (hozzáadás)"
msgid "Select members"
-msgstr "Tagok kiválasztása"
+msgstr "Tagok kijelölése"
msgid "Add the selected relations to the current selection"
-msgstr "A kiválasztott kapcsolatok hozzáadása az aktuális kiválasztáshoz"
+msgstr "A kijelölt kapcsolatok hozzáadása az aktuális kijelöléshez"
msgid "Set the current selection to the list of selected relations"
-msgstr "Az itt kijelölt kapcsolatok beállítása kiválasztásnak"
+msgstr "A jelenlegi kijelölés"
msgid "Select relation (add)"
-msgstr "Kapcsolat kiválasztása (hozzáadás)"
+msgstr "Kapcsolat kijelölése (hozzáadás)"
msgid "Select relation"
-msgstr "Kapcsolat kiválasztása"
+msgstr "Kapcsolat kijelölése"
msgid "<not>"
msgstr "<nem>"
@@ -2593,17 +2597,20 @@ msgid "MapCSS selector"
msgstr "MapCSS szelektor"
msgid "Selection settings"
-msgstr ""
+msgstr "Kijelölés beállításai"
msgid "Additional settings"
-msgstr ""
+msgstr "További beállítások"
msgid "Search syntax"
-msgstr ""
+msgstr "Keresési szintaxis"
msgid "Invalid search expression"
msgstr "Érvénytelen keresőkifejezés"
+msgid "Search by preset"
+msgstr "Keresés címkekészlet alapján"
+
msgid "Filter"
msgstr "Szűrő"
@@ -2626,7 +2633,7 @@ msgstr ""
" {0}"
msgid "Search hints"
-msgstr ""
+msgstr "Keresési tanácsok"
msgid "basics"
msgstr "egyszerű"
@@ -2706,8 +2713,16 @@ msgstr "minden zárt vonal"
msgid "object without useful tags"
msgstr "hasznos címke nélküli objektum"
+msgid "all objects that use the address preset"
+msgstr "összes objektum, ami lakcím címkekészletet használ"
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+"összes objektum, ami a Földrajz/Természet csoport alatti címkekészletet "
+"használ"
+
msgid "metadata"
-msgstr "metaadat"
+msgstr "metaadatok"
msgid "objects changed by user"
msgstr "a felhasználó által módosított objektumok"
@@ -2758,7 +2773,7 @@ msgid "all new objects"
msgstr "minden új objektum"
msgid "all selected objects"
-msgstr "minden kiválasztott objektum"
+msgstr "minden kijelölt objektum"
msgid "all incomplete objects"
msgstr "minden félkész objektum"
@@ -2821,7 +2836,7 @@ msgstr ""
"kereséssel"
msgid "Nothing found in selection by searching for ''{0}''"
-msgstr "Nem található objektum a kiválasztásban erre keresve: ''{0}''"
+msgstr "Nem található objektum a kijelölésben erre keresve: ''{0}''"
msgid "Found {0} matches"
msgstr "{0} találat"
@@ -2903,6 +2918,9 @@ msgstr "Pozitív egész szám szükséges"
msgid "Range of numbers expected"
msgstr "Várt számtartomány"
+msgid "Unknown preset name: "
+msgstr "Ismeretlen címkekészlet név: "
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Nem várt jel. Várt {0}, kapott {1}"
@@ -2946,7 +2964,7 @@ msgid "Cyclic dependency between relations:"
msgstr "Körkörös hivatkozás kapcsolatok között:"
msgid "Removed obsolete tags"
-msgstr "Elavult címkék eltávolítva"
+msgstr "Eltávolított elavult címkék"
msgid "Fix deprecated tags"
msgstr "Elavult címkék javítva"
@@ -2961,10 +2979,10 @@ msgstr ""
"körkörös hivatkozást.</html>"
msgid "Relation ..."
-msgstr "Kapcsolat ..."
+msgstr "Kapcsolat…"
msgid "... refers to relation"
-msgstr "... kapcsolatra hivatkozik"
+msgstr "…kapcsolatra hivatkozik"
msgid "Cycling dependencies"
msgstr "Körkörös hivatkozás"
@@ -3081,7 +3099,7 @@ msgstr[0] "\"{0}\" címke beállítása {1} objektumra"
msgstr[1] "\"{0}\" címke beállítása {1} objektumra"
msgid "Replace \"{0}\" by \"{1}\" for"
-msgstr "''{0}'' cserélése erre: ''{1}''"
+msgstr "''{0}'' kicserélése erre: ''{1}''"
msgid "object"
msgid_plural "objects"
@@ -3188,8 +3206,8 @@ msgstr[1] "{0} pont méretezése"
msgid "Selected {0} object"
msgid_plural "Selected {0} objects"
-msgstr[0] "{0} objektum kiválasztva"
-msgstr[1] "{0} objektum kiválasztva"
+msgstr[0] "{0} objektum kijelölve"
+msgstr[1] "{0} objektum kijelölve"
msgid "Sequence: {0}"
msgstr "Sorrend: {0}"
@@ -3429,7 +3447,7 @@ msgstr ""
msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
"Hiányzik a beállítás fájl: \"{0}\". Alapértelmezett beállítás fájl "
-"létrehozása..."
+"létrehozása…"
msgid ""
"Replacing existing preference file ''{0}'' with default preference file."
@@ -3580,7 +3598,7 @@ msgstr ""
"{1}"
msgid "Select WMTS layer"
-msgstr "Válaszd ki a WMTS réteget"
+msgstr "WMTS-réteg kijelölése"
msgid "Layer name"
msgstr "Rétegnév"
@@ -3592,7 +3610,7 @@ msgid "Matrix set identifier"
msgstr "Mátrix halmaz azonosító"
msgid "No default layer selected, choosing first layer."
-msgstr ""
+msgstr "Nincs kijelölve alapértelmezett réteg; első réteg kijelölése."
msgid "No layers defined by getCapabilities document: {0}"
msgstr "A getCapabilities dokumentum nem definiált rétegeket: {0}"
@@ -3849,12 +3867,11 @@ msgstr "várt érték"
msgid "UTM projection (''+proj=utm'') requires ''+zone=...'' parameter."
msgstr ""
-"Az UTM vetülethez (''+proj=utm'') szükséges a ''+zone=...'' paraméter "
-"megadása."
+"Az UTM vetülethez (''+proj=utm'') szükséges a ''+zone=…'' paraméter megadása."
msgid "Expected integer value in range 1-60 for ''+zone=...'' parameter."
msgstr ""
-"A ''+zone=...'' paraméternek 1 és 60 közé eső egész számnak kell lennie."
+"A ''+zone=…'' paraméternek 1 és 60 közé eső egész számnak kell lennie."
msgid "No unit found for: {0}"
msgstr "{0} mértékegysége nem található"
@@ -4071,7 +4088,7 @@ msgstr "API képességek hibáinak ellenőrzése"
msgid ""
"Way contains more than {0} nodes. It should be replaced by a multipolygon"
msgstr ""
-"A vonalt több, mint {0} pontot tartalmaz. Le kéne cserélni multipoligonra"
+"A vonalt több, mint {0} pontot tartalmaz. Le kellene cserélni multipoligonra"
msgid "Way contains more than {0} nodes. It should be split or simplified"
msgstr ""
@@ -4246,7 +4263,7 @@ msgid "Highway link is not linked to adequate highway/link"
msgstr "Az autópálya kapcsolat nincs megfelelő autópályához kapcsolva."
msgid "Missing pedestrian crossing information"
-msgstr "Hiányzik adat a gyalogos keresztezésről"
+msgstr "Hiányzó információ a gyalogosátkelőről"
msgid "Unknown country code: {0}"
msgstr "Ismeretlen országkód: {0}"
@@ -4501,7 +4518,7 @@ msgid "Missing power tower/pole within power line"
msgstr "Hiányzó oszlop/pózna a távvezetékben"
msgid "Public Transport Route"
-msgstr ""
+msgstr "Tömegközlekedési útvonal"
msgid "Route relation contains a ''{0}'' role"
msgstr "Az útvonal kapcsolatnak „{0}” szerepű tagja van"
@@ -4565,7 +4582,7 @@ msgid "Number of ''{0}'' roles too high ({1})"
msgstr "„{0}” szerepek száma túl magas ({1})"
msgid "Self-intersecting ways"
-msgstr "Önmagát metsző vonal"
+msgstr "Önmagukat metsző vonalak"
msgid ""
"This test checks for ways that contain some of their nodes more than once."
@@ -4978,7 +4995,7 @@ msgid "IO Exception"
msgstr "IO hiba"
msgid "Illegal Data"
-msgstr "Hibás adat"
+msgstr "Jogellenes adatok"
msgid "Offline mode"
msgstr "Offline mód"
@@ -5130,7 +5147,7 @@ msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/PATH/TO/JOSM/USERDATA"
msgid "Set the user data directory"
-msgstr "Felhasználói adat könyvtár beállítása"
+msgstr "Felhasználói adatkönyvtár beállítása"
msgid "/PATH/TO/JOSM/CACHE "
msgstr "/PATH/TO/JOSM/CACHE "
@@ -5152,7 +5169,7 @@ msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
"general one"
msgstr ""
-"Elsőbbségét tekintve a -Djosm.home alacsonyabb szintű, azaz a specifikusabb "
+"Elsőbbségét tekintve a -Djosm.home alacsonyabb szintű, azaz a konkrétabb "
"beállítás felülírja az általánosabbat"
msgid ""
@@ -5242,7 +5259,7 @@ msgstr ""
"részesítve az IPV6 felett."
msgid "Unsaved osm data"
-msgstr "Elmentetlen osm adat"
+msgstr "Elmentetlen OSM-adatok"
msgid "Restore"
msgstr "Visszaállítás"
@@ -5321,7 +5338,7 @@ msgid "Presets"
msgstr "Címkék"
msgid "More..."
-msgstr "Továbbiak..."
+msgstr "Továbbiak…"
msgctxt "menu"
msgid "GPS"
@@ -5479,7 +5496,7 @@ msgid "Last change date"
msgstr "Utolsó módosítás dátuma"
msgid "Select note sorting method"
-msgstr "Jegyzet rendezési módszer kiválasztása"
+msgstr "Jegyzetrendezési módszer kijelölése"
msgid "Click to cancel the current operation"
msgstr "Kattintson ide a jelenlegi művelet megszakításához"
@@ -5494,10 +5511,12 @@ msgid " ({0})"
msgstr " ({0})"
msgid "<h2>Filter active: {0}</h2>"
-msgstr ""
+msgstr "<h2>Szűrő aktív: {0}</h2>"
msgid "</p><p>Click again on filter button to see all objects.</p></html>"
msgstr ""
+"</p><p>Az összes objektum megjelenítéséhez kattints még egyszer a szűrő "
+"gombra.</p></html>"
msgid "Enlarge"
msgstr "Nagyít"
@@ -5569,7 +5588,7 @@ msgid "Conflict background: combined"
msgstr "Ütközés háttérszín: egyesített"
msgid "Conflict background: selected"
-msgstr "Ütközés háttérszín: kiválasztott"
+msgstr "Ütközés háttérszín: kijelölt"
msgid "Conflict foreground: undecided"
msgstr "Ütközés előtérszín: eldöntetlen"
@@ -5644,7 +5663,7 @@ msgid "Conflict foreground: remove member"
msgstr "Ütközés előtér: tag eltávolítása"
msgid "{0} more..."
-msgstr "még {0} ..."
+msgstr "még {0}…"
msgid ""
"The following objects could not be copied to the target object<br>because "
@@ -5769,13 +5788,13 @@ msgid "Up"
msgstr "Fel"
msgid "Move up the selected entries by one position."
-msgstr "A kiválasztott elemek eggyel feljebb mozgatása."
+msgstr "A kijelölt elemek eggyel feljebb mozgatása."
msgid "Down"
msgstr "Le"
msgid "Move down the selected entries by one position."
-msgstr "A kiválasztott elemek mozgatása egy hellyel lejjebb."
+msgstr "A kijelölt elemek mozgatása egy hellyel lejjebb."
msgid "Remove"
msgstr "Eltávolítás"
@@ -5997,10 +6016,10 @@ msgid "Value"
msgstr "Érték"
msgid "Keep the selected key/value pairs from the local dataset"
-msgstr "Kiválasztott kulcs/érték pár megtartása a helyi adathalmazból"
+msgstr "Kijelölt kulcs/érték pár megtartása a helyi adathalmazból"
msgid "Keep the selected key/value pairs from the server dataset"
-msgstr "Kiválasztott kulcs/érték pár megtartása a szerver adathalmazából"
+msgstr "Kijelölt kulcs/érték pár megtartása a szerver adathalmazából"
msgid "Undecide"
msgstr "Eldöntetlen"
@@ -6118,7 +6137,7 @@ msgstr ""
"Minden \"{0}\" módon összekapcsolt érték alkalmazva lesz \"{1}\" kulcsra"
msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "A címkegyűjtemény nem tartalmazza a kiválasztott ''{0}'' értéket."
+msgstr "A címkegyűjtemény nem tartalmazza a kijelölt ''{0}'' értéket."
msgid "Not decided yet."
msgstr "Még nincs eldöntve"
@@ -6136,13 +6155,13 @@ msgid "Conflicts in pasted tags"
msgstr "Ütközések a beillesztett címkékben"
msgid "Paste ..."
-msgstr "Beillesztés ..."
+msgstr "Beillesztés…"
msgid "From ..."
-msgstr "Innen ..."
+msgstr "Innen:"
msgid "To ..."
-msgstr "Ide ..."
+msgstr "Ide:"
msgid "{0} tag"
msgid_plural "{0} tags"
@@ -6306,19 +6325,19 @@ msgid ""
"objects are removed. Do you want to paste the data without the incomplete "
"objects?"
msgstr ""
-"A másolt adat félkész objektumokat tartalmaz. Beillesztésnél a félkész "
-"objektumok el lesznek távolítva. Szeretnéd beilleszteni az adatot a félkész "
-"objektumok nélkül?"
+"A másolt adatok félkész objektumokat tartalmaznak. Beillesztésnél a félkész "
+"objektumok el lesznek távolítva. Szeretnéd beilleszteni az adatokat a "
+"félkész objektumok nélkül?"
msgid "For selected objects only"
-msgstr "Csak a kiválasztott objektumok"
+msgstr "Csak a kijelölt objektumok"
msgid ""
"<html>Select to show changesets for the currently selected objects "
"only.<br>Unselect to show all changesets for objects in the current data "
"layer.</html>"
msgstr ""
-"<html>Pipáld ki, hogy csak a kiválasztott objektumok módosításcsomagjait "
+"<html>Pipáld ki, hogy csak a kijelölt objektumok módosításcsomagjait "
"lásd.<br>Ha nincs kipipálva, az aktív adatréteg összes objektumának "
"módosításcsomagját látod.</html>"
@@ -6329,7 +6348,7 @@ msgid "Open the list of changesets in the current layer."
msgstr "Az aktív réteg módosításcsomag-listájának megnyitása"
msgid "Select all objects assigned to the currently selected changesets"
-msgstr "A kijelölt módosításcsomagba tartozó összes objektum kijelölése"
+msgstr "A kijelölt módosításcsomagokba tartozó összes objektum kijelölése"
msgid "Download"
msgstr "Letöltés"
@@ -6337,7 +6356,7 @@ msgstr "Letöltés"
msgid ""
"Download information about the selected changesets from the OSM server"
msgstr ""
-"Információk letöltése a kijelölt módosításcsomagról az OSM szerverről"
+"Információk letöltése a kijelölt módosításcsomagokról az OSM-szerverről"
msgid "Closes the selected open changesets"
msgstr "A kijelölt nyitott módosításcsomagok lezárása"
@@ -6346,14 +6365,14 @@ msgid "Show info"
msgstr "Információk"
msgid "Open a web page for each selected changeset"
-msgstr "A kijelölt módosításcsomagok adatai webes felületen"
+msgstr "Weboldal megnyitása az egyes kijelölt módosításcsomagoknak"
msgid "Details"
msgstr "Részletek"
msgid "Opens the Changeset Manager window for the selected changesets"
msgstr ""
-"Megnyitja a változás követő ablakot a kiválasztott módosításcsomagokhoz."
+"Megnyitja a módosításcsomag-kezelő ablakot a kijelölt módosításcsomagokhoz."
msgid "Command Stack"
msgstr "Műveletsor"
@@ -6372,20 +6391,20 @@ msgid ""
msgstr "A műveletben résztvevő objektumok kijelölése (kivéve a töröltek)"
msgid "Select and zoom"
-msgstr "Kiválaszt és ráközelít"
+msgstr "Kijelölés és ráközelítés"
msgid ""
"Selects the objects that take part in this command (unless currently "
"deleted), then and zooms to it"
msgstr ""
-"Kiválasztja a műveletben résztvevő objektumokat (hacsak nincs törölve), és "
+"Kijelöli a műveletben részt vevő objektumokat (hacsak nincs törölve), és "
"rájuk nagyít"
msgid "Undo the selected and all later commands"
-msgstr "A kiválasztott művelet és az utána következők visszavonása"
+msgstr "A kijelölt művelet és az utána következők visszavonása"
msgid "Redo the selected and all earlier commands"
-msgstr "A kiválasztott művelet és az előtte levők megismétlése"
+msgstr "A kijelölt művelet és az előtte levők megismétlése"
msgid "Resolve conflicts."
msgstr "Ütközések megszűntetése"
@@ -6630,7 +6649,7 @@ msgid "Version: "
msgstr "Változat: "
msgid "In changeset: "
-msgstr "Módosításcsomag: "
+msgstr "A következő módosításcsomagban: "
msgid "Tags: "
msgstr "Címkék: "
@@ -6717,16 +6736,16 @@ msgstr ""
"Generált stílusok listája:\n"
msgid "The 2 selected objects have identical style caches."
-msgstr "A 2 kiválasztott objektum azonos stílus cache-t használ"
+msgstr "A 2 kijelölt objektum azonos stílus cache-t használ"
msgid "The 2 selected objects have different style caches."
-msgstr "A 2 kiválasztott objektum különböző stílus cache-t használ."
+msgstr "A 2 kijelölt objektum különböző stílus cache-t használ."
msgid ""
"Warning: The 2 selected objects have equal, but not identical style caches."
msgstr ""
-"Figyelmeztetés: A 2 kiválasztott objektum egyenlő, de nem megegyező stílus "
-"cache-t használ."
+"Figyelmeztetés: A 2 kijelölt objektum egyenlő, de nem megegyező stílus cache-"
+"t használ."
msgid "{0} user last edited the selection:"
msgid_plural "{0} users last edited the selection:"
@@ -6789,8 +6808,8 @@ msgid ""
"You can also use the syntax <tt>lat=\"...\" lon=\"...\"</tt> or "
"<tt>lat=''...'' lon=''...''</tt>."
msgstr ""
-"a következő szintaxis is használható: <tt>lat=\"...\" lon=\"...\"</tt> or "
-"<tt>lat=''...'' lon=''...''</tt>."
+"a következő szintaxis is használható: <tt>lat=\"…\" lon=\"…\"</tt> or "
+"<tt>lat=''…'' lon=''…''</tt>."
msgid "Some examples:"
msgstr "Néhány példa:"
@@ -6811,7 +6830,7 @@ msgid "East/North"
msgstr "Keleti/Északi"
msgid "Please enter a GPS coordinates"
-msgstr "Kérlek add meg a GPS koordinátákat"
+msgstr "Kérlek add meg a GPS-koordinátákat"
msgid "Please enter a Easting and Northing"
msgstr "Írd be a keleti és északi koordinátákat"
@@ -6840,8 +6859,8 @@ msgstr "zoomszint automatikus illesztése a réteg felbontásához"
msgid ""
"scale follows native resolution of another layer (click to set this layer)"
msgstr ""
-"a zoomszint másik réteg felbontásához van illesztve (kattints a réteget "
-"kiválasztásához)"
+"a zoomszint másik réteg felbontásához van illesztve (kattints a réteg "
+"beállításához)"
msgid "this layer has no native resolution"
msgstr "a réteg nem rendelkezik saját felbontással"
@@ -6865,19 +6884,19 @@ msgid "On/Off"
msgstr "Be/Ki"
msgid "Turn selected styles on or off"
-msgstr "A kiválasztott stílusok ki- vagy bekapcsolása"
+msgstr "A kijelölt stílusok ki- vagy bekapcsolása"
msgid "Move the selected entry one row down."
-msgstr "A kiválasztott elem egy sorral lejjebb mozgatása"
+msgstr "A kijelölt bejegyzés egy sorral lejjebb mozgatása"
msgid "Move the selected entry one row up."
-msgstr "A kiválasztott elem egy sorral feljebb mozgatása"
+msgstr "A kijelölt bejegyzés egy sorral feljebb mozgatása"
msgid "Reload from file"
msgstr "Újratöltés fájlból"
msgid "reload selected styles from file"
-msgstr "kiválasztott stílusok újratöltése fájlból"
+msgstr "kijelölt stílusok újratöltése fájlból"
msgid "Save as..."
msgstr "Mentés másként…"
@@ -7051,19 +7070,19 @@ msgid "Relations: {0}"
msgstr "Kapcsolatok: {0}"
msgid "Selection"
-msgstr "Kiválasztás"
+msgstr "Kijelölés"
msgid "Open a selection list window."
msgstr "A kiválsztott objektumok listájának megnyitása"
msgid "Current Selection"
-msgstr "Jelenlegi kiválasztás"
+msgstr "Jelenlegi kijelölés"
msgid "Search for objects"
msgstr "Objektumok keresése"
msgid "Display the history of the selected objects."
-msgstr "A kiválsztott objektumok történetének megjelenítése"
+msgstr "A kijelölt objektumok előzményeinek megjelenítése."
msgid "Zoom to selection"
msgstr "Nagyítás a kijelölésre"
@@ -7078,7 +7097,7 @@ msgid "Unselectable now"
msgstr "Jelenleg nem választható"
msgid "Selection: {0}"
-msgstr "Kiválasztva: {0}"
+msgstr "Kijelölés: {0}"
msgid "Always shown"
msgstr "Mindig megjelenik"
@@ -7112,8 +7131,7 @@ msgid "Authors"
msgstr "Szerkesztők"
msgid "Open a list of people working on the selected objects."
-msgstr ""
-"A kiválasztott objektumokon dolgozó szerkesztők listájának megnyitása"
+msgstr "A kijelölt objektumokon dolgozó szerkesztők listájának megnyitása"
msgid "{0} Author"
msgid_plural "{0} Authors"
@@ -7121,7 +7139,7 @@ msgstr[0] "{0} szerkesztő"
msgstr[1] "{0} szerkesztő"
msgid "Select objects submitted by this user"
-msgstr "Felhasználó által beküldött objektumok kiválasztása"
+msgstr "Az e felhasználó által beküldött objektumok kijelölése"
msgid "Launches a browser with information about the user"
msgstr "A felhasználóról további információkat nyit meg a böngészőben"
@@ -7155,10 +7173,10 @@ msgid "Fix"
msgstr "Javítás"
msgid "Fix the selected issue."
-msgstr "Kiválasztott probléma javítása."
+msgstr "Kijelölt probléma javítása."
msgid "Ignore the selected issue next time."
-msgstr "Legközelebb hagyja figyelmen kívül a kiválasztott problémát."
+msgstr "Legközelebb hagyja figyelmen kívül a kijelölt problémát."
msgid "Whole group"
msgstr "Teljes csoportot"
@@ -7176,13 +7194,13 @@ msgid "Ignoring elements"
msgstr "Elemek mellőzése"
msgid "Fixing errors ..."
-msgstr "Javítási hibák ..."
+msgstr "Javítási hibák…"
msgid "Fixing ({0}/{1}): ''{2}''"
msgstr "Javítás ({0}/{1}): ''{2}''"
msgid "Updating map ..."
-msgstr "Térkép frissítése ..."
+msgstr "Térkép frissítése…"
msgid "anonymous"
msgstr "névtelen"
@@ -7204,42 +7222,42 @@ msgid "Discussion"
msgstr "Vita"
msgid "Display the public discussion around this changeset"
-msgstr "Nyílt vita megjelenítése ehhez a módosítási csomaghoz"
+msgstr "A módosításcsomaghoz tartozó nyílt vita megjelenítése"
msgid "Changeset Management Dialog"
-msgstr "Módosításcsomag kezelő ablak"
+msgstr "Módosításcsomag-kezelő párbeszédpanel"
msgid "Close the dialog"
-msgstr "Ablak bezárása"
+msgstr "Párbeszédpanel bezárása"
msgid "Query"
-msgstr "Lekérés"
+msgstr "Lekérdezés"
msgid "Launch the dialog for querying changesets"
-msgstr "Dialógusablak a módosításcsomagok lekérdezéséhez"
+msgstr "Párbeszédpanel indítása a módosításcsomagok lekérdezéséhez"
msgid "Remove from cache"
msgstr "Eltávolítás a gyorsítótárból"
msgid "Remove the selected changesets from the local cache"
-msgstr "A kiválasztott módosításcsomagok eltávolítása a helyi gyorsítótárból"
+msgstr "A kijelölt módosításcsomagok eltávolítása a helyi gyorsítótárból"
msgid "Close the selected changesets"
-msgstr "A kiválasztott módosításcsomagok lezárása"
+msgstr "A kijelölt módosításcsomagok lezárása"
msgid "Update changeset"
msgstr "Módosításcsomag frissítése"
msgid "Updates the selected changesets with current data from the OSM server"
msgstr ""
-"Frissíti a kiválasztott módosításcsomagokat a OSM szerveren lévő aktuális "
+"Frissíti a kijelölt módosításcsomagokat a OSM szerveren lévő aktuális "
"adatokkal"
msgid "Download changeset content"
msgstr "Módosításcsomag-tartalom letöltése"
msgid "Download the content of the selected changesets from the server"
-msgstr "A kiválasztott módosításcsomagok adatainak letöltése a szerverről"
+msgstr "A kijelölt módosításcsomagok adatainak letöltése a szerverről"
msgid "Download changed objects"
msgstr "Módosított objektumok letöltése"
@@ -7248,8 +7266,8 @@ msgid ""
"Download the current version of the changed objects in the selected "
"changesets"
msgstr ""
-"A kiválasztott módosításcsomagok módosított objektumainak jelenlegi "
-"változatának letöltése"
+"A kijelölt módosításcsomagok módosított objektumainak jelenlegi változatának "
+"letöltése"
msgid "My changesets"
msgstr "Saját módosításcsomagjaim"
@@ -7303,14 +7321,14 @@ msgid_plural ""
"<html>None of the selected objects is available in the current<br>edit layer "
"''{0}''.</html>"
msgstr[0] ""
-"<html>A kiválasztott objektum nem elérhető a jelenlegi<br> ''{0}'' "
-"szerkesztési rétegen.</html>"
+"<html>A kijelölt objektum nem érhető el a jelenlegi<br> ''{0}'' szerkesztési "
+"rétegen.</html>"
msgstr[1] ""
-"<html>A kiválasztott objektumok nem elérhetőek a jelenlegi<br>''{0}'' "
+"<html>A kijelölt objektumok nem érhetőek el a jelenlegi<br>''{0}'' "
"szerkesztési rétegen.</html>"
msgid "Download and show the history of the selected objects"
-msgstr "A kiválasztott objektum előzményeinek letöltése és megjelenítése"
+msgstr "A kijelölt objektum előzményeinek letöltése és megjelenítése"
msgid "Download objects"
msgstr "Objektumok letöltése"
@@ -7319,13 +7337,13 @@ msgid "Download the current version of the selected objects"
msgstr "A kijelölt objektumok jelenlegi verziójának letöltése"
msgid "Select in layer"
-msgstr "Kiválasztás a rétegen"
+msgstr "Kijelölés a rétegen"
msgid "Select the corresponding primitives in the current data layer"
msgstr "A megfelelő elemek kijelölése a jelenlegi adatrétegen"
msgid "Nothing to select"
-msgstr "Nincs mit kiválasztani"
+msgstr "Nincs mit kijelölni"
msgid "Zoom to in layer"
msgstr "Ráközelítés a rétegen"
@@ -7385,7 +7403,7 @@ msgid ""
"Select the primitives in the content of this changeset in the current data "
"layer"
msgstr ""
-"A Módosításcsomag-tartalom elemeinek kiválasztása a jelenlegi adatrétegen."
+"A módosításcsomag-tartalom elemeinek kijelölése a jelenlegi adatrétegen"
msgid ""
"<html>None of the objects in the content of changeset {0} is available in "
@@ -7398,13 +7416,13 @@ msgid ""
"Zoom to the objects in the content of this changeset in the current data "
"layer"
msgstr ""
-"A Módosításcsomag-tartalom elemeire közelítés a jelenlegi adatrétegen."
+"A módosításcsomag-tartalom elemeire közelítés a jelenlegi adatrétegen."
msgid "Update changeset discussion"
-msgstr "A változtatási csomagról szóló vita frissítése"
+msgstr "A módosításcsomagról szóló vita frissítése"
msgid "Update the changeset discussion from the OSM server"
-msgstr "A változtatási csomagról szóló vita frissítése az OSM szerverről"
+msgstr "A módosításcsomagról szóló vita frissítése az OSM szerverről"
msgid "Date"
msgstr "Dátum"
@@ -7440,22 +7458,24 @@ msgid ""
"Download the changeset with the specified id, including the changeset content"
msgstr ""
"A megadott azonosítójú módosításcsomag letöltése, beleértve a "
-"módosításcsomag tartalmát"
+"módosításcsomag tartalmát is"
msgid "Select changesets owned by specific users"
-msgstr "Adott felhasználó módosításcsomagjai"
+msgstr "Adott felhasználó módosításcsomagjainak kijelölése"
msgid "Select changesets depending on whether they are open or closed"
msgstr ""
-"Módosításcsomagok kiválasztása aszerint, hogy megnyitva, vagy lezárva vannak"
+"Módosításcsomagok kijelölése aszerint, hogy meg vannak-e nyitva vagy le "
+"vannak-e zárva"
msgid ""
"Select changesets based on the date/time they have been created or closed"
msgstr ""
-"Módosításcsomagok kiválasztása megnyitás, vagy lezárás dátuma/ideje szerint"
+"Módosításcsomagok kijelölése megnyitás, vagy lezárás dátuma/ideje szerint"
msgid "Select only changesets related to a specific bounding box"
-msgstr "Mmódosításcsomagok kiválasztása egy határolónégyzhez kapcsolódóan"
+msgstr ""
+"Csak az adott határolónégyzethez kapcsolódó módosításcsomagok kijelölése"
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
@@ -7469,7 +7489,7 @@ msgid ""
"changeset query to a specific bounding box.</html>"
msgstr ""
"<html>Kérlek adj meg egy érvényes hosszúság/szélesség értéket<br>a "
-"módosításcsomag-lekérdezés határolónégyzetre korlátozásához.</html>"
+"módosításcsomag-lekérdezés adott határolónégyzetre korlátozásához.</html>"
msgid "Invalid bounding box"
msgstr "Érvénytelen határolónégyzet"
@@ -7600,24 +7620,24 @@ msgstr "Csak ezen dátum/idő után lezárt módosításcsomagok"
msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
-"Csak ezen dátum/idő után lezárt, vagy előtt létrehozott módosításcsomagok"
+"Csak az adott dátum/idő után lezárt, vagy előtt létrehozott módosításcsomagok"
msgid ""
"Cannot build changeset query with time based restrictions. Input is not "
"valid."
msgstr ""
-"Nem lehet lekérdezést készíteni ezzel az időkorlátozással. Az érték "
-"érvénytelen."
+"Nem lehet módosításcsomag-lekérdezést készíteni ezzel az időkorlátozással. "
+"Az érték érvénytelen."
msgid ""
"<html>Please enter valid date/time values to restrict<br>the query to a "
"specific time range.</html>"
msgstr ""
-"<html>Kérlek adj meg egy érvényes dátum/idő értéket<br>a lekérdezés időre "
+"<html>Kérlek adj meg egy érvényes dátum-/időértéket<br>a lekérdezés időre "
"vonatkozó korlátozásához.</html>"
msgid "Invalid date/time values"
-msgstr "Érvénytelen dátum/idő értékek"
+msgstr "Érvénytelen dátum-/időértékek"
msgid ""
"Please enter a valid time in the usual format for your locale.<br>Example: "
@@ -7709,13 +7729,13 @@ msgid "Activate"
msgstr "Aktiválás"
msgid "Activate the selected layer"
-msgstr "A kiválasztott réteg aktiválása"
+msgstr "A kijelölt réteg aktiválása"
msgid "Activate layer"
msgstr "Réteg aktiválása"
msgid "Delete the selected layers."
-msgstr "Kiválasztott rétegek törlése."
+msgstr "Kijelölt rétegek törlése."
msgid "Duplicate this layer"
msgstr "Réteg megkettőzése"
@@ -7727,7 +7747,7 @@ msgid "Copy {1} of {0}"
msgstr "{0} másolata ({1})"
msgid "Change visibility of the selected layer."
-msgstr "A kiválasztott réteg láthatóságának váltása"
+msgstr "A kijelölt réteg láthatóságának váltása"
msgid "Show layer"
msgstr "Réteg megjelenítése"
@@ -7763,28 +7783,28 @@ msgid "Merge this layer into another layer"
msgstr "A réteg egyesítése másik réteggel"
msgid "Move the selected layer one row down."
-msgstr "A kiválasztott réteget eggyel lejjebb mozgatja"
+msgstr "A kijelölt réteget eggyel lejjebb mozgatja"
msgid "Move the selected layer one row up."
-msgstr "A kiválasztott réteget eggyel feljebb mozgatja"
+msgstr "A kijelölt réteget eggyel feljebb mozgatja"
msgid "Show/hide"
msgstr "Mutat/Elrejt"
msgid "Toggle visible state of the selected layer."
-msgstr "A kiválasztott réteg láthatóságának átkapcsolása"
+msgstr "A kijelölt réteg láthatóságának átkapcsolása"
msgid "Show/hide layer"
msgstr "Réteg elrejtése/mutatása"
msgid "Discardable key: selection Foreground"
-msgstr "Eldobható kulcs: kiválasztás előtér"
+msgstr "Eldobható kulcs: kijelölés előtér"
msgid "Discardable key: foreground"
msgstr "Eldobható kulcs: előtér"
msgid "Discardable key: selection Background"
-msgstr "Eldobható kulcs: kiválasztás háttér"
+msgstr "Eldobható kulcs: kijelölés háttér"
msgid "Discardable key: background"
msgstr "Eldobható kulcs: háttér"
@@ -7803,7 +7823,8 @@ msgstr[0] ", {0} nincs"
msgstr[1] ", {0} nincs"
msgid "Select objects for which to change tags."
-msgstr "Válassz objektumokat, amiknek megváltoztatnád a címkéit."
+msgstr ""
+"Jelöld ki azokat az objektumokat, amelyeknek megváltoztatnád a címkéit."
msgid "Tags/Memberships"
msgstr "Címkék/Tagságok"
@@ -7830,7 +7851,7 @@ msgid "Tags: {0} / Memberships: {1}"
msgstr "Címke: {0} / Tagság: {1}"
msgid "Delete the selected key in all objects"
-msgstr "A kiválasztott kulcs törlése az összes objektumból"
+msgstr "A kijelölt kulcs törlése az összes objektumból"
msgid "Delete Tags"
msgstr "Címkék törlése"
@@ -7842,7 +7863,7 @@ msgid "Delete from relation"
msgstr "Törlés a kapcsolatból"
msgid "Really delete selection from relation {0}?"
-msgstr "Biztosan törlöd a kiválasztást a {0} kapcsolatból?"
+msgstr "Biztosan törlöd a kijelölést a {0} kapcsolatból?"
msgid "Add a new key/value pair to all objects"
msgstr "Új kulcs/érték pár hozzáadása az objektumokhoz"
@@ -7866,13 +7887,13 @@ msgid "Go to Taginfo"
msgstr "Megtekintés Taginfón"
msgid "Launch browser with Taginfo statistics for selected object"
-msgstr "Taginfo statisztika megtekintése a kiválasztott címkéről böngészőben"
+msgstr "Taginfo statisztika megtekintése a kijelölt címkéről böngészőben"
msgid "Paste Value"
msgstr "Érték beillesztése"
msgid "Paste the value of the selected tag from clipboard"
-msgstr "A kiválasztott címke értékének beillesztése a vágólapról"
+msgstr "A kijelölt címke értékének beillesztése a vágólapról"
msgid "Copy Value"
msgstr "Érték másolása"
@@ -7884,7 +7905,7 @@ msgid "Copy selected Key(s)/Value(s)"
msgstr "Kijelölt kulcsok/értékek másolása"
msgid "Copy the key and value of the selected tag(s) to clipboard"
-msgstr "A kiválasztott címk(ék) kulcs-érték párjának másolása a vágólapra"
+msgstr "A kijelölt címk(ék) kulcs-érték párjának másolása a vágólapra"
msgid "Copy all Keys/Values"
msgstr "Összes kulcs/érték másolása"
@@ -8037,10 +8058,10 @@ msgid "Download All Children"
msgstr "Összes gyerek letöltése"
msgid "Download selected relations"
-msgstr "Kiválasztott kapcsolatok letöltése"
+msgstr "kijelölt kapcsolatok letöltése"
msgid "Download Selected Children"
-msgstr "Kiválasztott gyerekek letöltése"
+msgstr "Kijelölt gyerekek letöltése"
msgid "Conflict in data"
msgid_plural "Conflicts in data"
@@ -8087,7 +8108,7 @@ msgid "Download relations"
msgstr "Kapcsoaltok letöltése"
msgid "({0}/{1}): Downloading relation ''{2}''..."
-msgstr "({0}/{1}): ''{2}'' kapcsolat letöltése..."
+msgstr "({0}/{1}): ''{2}'' kapcsolat letöltése…"
msgid "Tags and Members"
msgstr "Címkék és tagok"
@@ -8281,7 +8302,7 @@ msgid "Download Members"
msgstr "Tagok letöltése"
msgid "Download selected incomplete members"
-msgstr "Kiválasztott félkész tagok letöltése"
+msgstr "Kijelölt félkész tagok letöltése"
msgid "Edit the relation the currently selected relation member refers to"
msgstr "Azon kapcsolat szerkesztése, amikre a kijelölt kapcsolat hivatkozik"
@@ -8391,22 +8412,22 @@ msgstr ""
"próbáld újra.</html>"
msgid "Select objects for selected relation members"
-msgstr "A kijelölt kapcsolattagoknak megfelelő objektumok kiválasztása"
+msgstr "A kijelölt kapcsolattagoknak megfelelő objektumok kijelölése"
msgid ""
"Select relation members which refer to objects in the current selection"
msgstr ""
-"Kapcsolattagok kijelölése, amik a jelenleg kiválasztott objektumokra "
+"Azon kapcsolattagok kijelölése, amelyek a jelenlegi kijelölés objektumaira "
"hivatkoznak"
msgid ""
"Select relation members which refer to {0} objects in the current selection"
msgstr ""
-"Kapcsolattagok kijelölése, amik a jelenlegi kiválasztás {0} objektumára "
-"hivatkoznak"
+"Azon kapcsolattagok kijelölése, amelyek a jelenlegi kijelölés {0} "
+"objektumára hivatkoznak"
msgid "Sets a role for the selected members"
-msgstr "Szerep beállítása a kiválasztott tagoknak"
+msgstr "Szerep beállítása a kijelölt tagoknak"
msgid "Apply Role"
msgstr "Szerep alkalmazása"
@@ -8441,7 +8462,7 @@ msgid "Sort below"
msgstr "Rendezés alatta"
msgid "Sort the selected relation members and all members below"
-msgstr "A kiválasztott kapcsolattag és az alatta lévők sorbarendezése"
+msgstr "A kijelölt kapcsolattagok és az alatta lévők sorbarendezése"
msgid "way is connected"
msgstr "vonal csatlakoztatva"
@@ -8461,6 +8482,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Hibás argumentumszámú könyvjelző"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Nem sikerült olvasni a könyvjelző bejegyzést: %s"
@@ -8468,7 +8492,7 @@ msgid "Bookmarks"
msgstr "Könyvjelzők"
msgid "<html>There is currently no download area selected.</html>"
-msgstr "<html>Jelenleg nincs letöltött terület kiválasztva.</html>"
+msgstr "<html>Jelenleg nincs letöltött terület kijelölve.</html>"
msgid ""
"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
@@ -8481,12 +8505,11 @@ msgid "Create bookmark"
msgstr "Könyvjelző létrehozása"
msgid "Add a bookmark for the currently selected download area"
-msgstr "Könyvjelző létrehozása a jelenleg kiválasztott letöltési területhez"
+msgstr "Könyvjelző létrehozása a jelenleg kijelölt letöltési területhez"
msgid ""
"Currently, there is no download area selected. Please select an area first."
-msgstr ""
-"Jelenleg nincs letöltési terület kiválasztva. Előbb válassz ki egyet."
+msgstr "Jelenleg nincs letöltési terület kijelölve. Előbb válassz ki egyet."
msgid "Please enter a name for the bookmarked download area."
msgstr "Add meg a letöltendő terület könyvjelzőjének nevét."
@@ -8500,6 +8523,9 @@ msgstr "A kijelölt könyvjelzők törlése"
msgid "Rename the currently selected bookmark"
msgstr "A kijelölt könyvjelző átnevezése"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "min. szél."
@@ -8542,17 +8568,17 @@ msgstr "OpenStreetMap adatok"
msgid "Select to download OSM data in the selected download area."
msgstr ""
-"Pipáld ki az OSM adatok letöltéséhez a kijelölt letöltési területről."
+"Jelöld be a kijelölt letöltési területen található OSM-adatok letöltéséhez."
msgid "Raw GPS data"
-msgstr "Nyers GPS adatok"
+msgstr "Nyers GPS-adatok"
msgid "Select to download GPS traces in the selected download area."
msgstr ""
-"Pipáld ki a GPS nyomvonalak letöltéséhez a kijelölt letöltési területről."
+"Jelöld ki a GPS-nyomvonalak letöltéséhez a kijelölt letöltési területről."
msgid "Select to download notes in the selected download area."
-msgstr "Pipáld ki a kijelölt területen lévő jegyzetek letöltéséhez."
+msgstr "Jelöld be a kijelölt területen lévő jegyzetek letöltéséhez."
msgid "Download as new layer"
msgstr "Letöltés új rétegre"
@@ -8590,7 +8616,7 @@ msgstr ""
"mozgatja a térképet, az egérgörgő nagyítja."
msgid "No area selected yet"
-msgstr "Nincs kiválasztott terület"
+msgstr "Nincs kijelölt terület"
msgid "Download area too large; will probably be rejected by server"
msgstr "Letöltési terület túl nagy, valószínűleg a szerver elutasítja"
@@ -8633,7 +8659,7 @@ msgstr ""
"kell tölteni a pontokhoz"
msgid "Select if the members of a relation should be downloaded as well"
-msgstr "Jelöld ki, ha a kapcsolat tagjait is e kell tölteni"
+msgstr "Jelöld be, ha a kapcsolat tagjait is le kellene tölteni"
msgid "Download referrers (parent relations and ways)"
msgstr "Hivatkozók (szülő kapcsolatok és utak) letöltése"
@@ -8657,7 +8683,7 @@ msgid "Areas around places"
msgstr "Név szerinti keresés"
msgid "Search ..."
-msgstr "Keresés ..."
+msgstr "Keresés…"
msgid "Click to start searching for places"
msgstr "Kattints a helyek kereséséhez"
@@ -8666,7 +8692,7 @@ msgid "Querying name server"
msgstr "Névszerver lekérdezése"
msgid "Querying name server ..."
-msgstr "Névszerver lekérdezése ..."
+msgstr "Névszerver lekérdezése…"
msgid "Error occured with query ''{0}'': ''{1}''"
msgstr "Hiba történt a(z) „{0}” lekérdezés közben: „{1}”"
@@ -9021,7 +9047,7 @@ msgid ""
"Select which actions to perform for this layer, if you click the leftmost "
"button."
msgstr ""
-"Válaszd ki, milyen művelet törtéjen a réteggel, ha megnyomod a bal oldali "
+"Jelöld ki, milyen művelet történjék a réteggel, ha megnyomod a bal oldali "
"gombot."
msgid "Check \"Upload\" to upload the changes to the OSM server."
@@ -9080,13 +9106,13 @@ msgstr ""
"Adatok feltöltése egy már létező és nyitott állapotú módosításcsomagba"
msgid "Select an open changeset"
-msgstr "Válassz nyitott módosításcsomagot"
+msgstr "Nyitott módosításcsomag kijelölése"
msgid "Close changeset after upload"
msgstr "Módosításcsomag lezárása feltöltés után"
msgid "Select to close the changeset after the next upload"
-msgstr "Ha kipipálod, a módosításcsomag feltöltés után le lesz zárva"
+msgstr "Jelöld ki a módosításcsomag következő feltöltés utáni lezárásához"
msgid "Load the list of your open changesets from the server"
msgstr "Nyitott módosításcsomagjaid listájának lekérése a szerverről"
@@ -9105,7 +9131,7 @@ msgid "Close changesets"
msgstr "Módosításcsomagok lezárása"
msgid "Close the selected open changesets"
-msgstr "Kiválasztott módosításcsomagok lezárása"
+msgstr "Kijelölt módosításcsomagok lezárása"
msgid "Cancel closing of changesets"
msgstr "Módosításcsomagok lezárásának megszakítása"
@@ -9230,7 +9256,7 @@ msgstr ""
"Nem sikerült a jelenlegi JOSM felhasználó adatait lekérni. Kivétel: {0}"
msgid "Initializing nodes to download ..."
-msgstr "Pontok előkészítes letöltéshez ..."
+msgstr "Pontok előkészítése letöltéshez…"
msgid "Object could not be downloaded"
msgid_plural "Some objects could not be downloaded"
@@ -9261,8 +9287,8 @@ msgid ""
"Either edit the path manually in the text field or click the \"...\" button "
"to open a file chooser."
msgstr ""
-"Az útvonalat szerkesztheted manuálisan is a szövegmezőben, vagy kattints a "
-"\"...\" gombra a fájltallózó megnyitásához."
+"Az elérési útvonalat szerkesztheted manuálisan is a szövegmezőben, vagy "
+"kattints a \"…\" gombra a fájltallózó megnyitásához."
msgid "The bold text is the name of the layer."
msgstr "A félkövér szöveg a réteg neve."
@@ -9277,13 +9303,13 @@ msgid "File ''{0}'' is not writable. Please enter another file name."
msgstr "''{0}'' fájl nem írható. Kérlek válassz másik fájlnevet."
msgid "Click cell to change the file path."
-msgstr "Kattints ide a mentési útvonal megadásához."
+msgstr "Kattints ide a mentési útvonal módosításához."
msgid "Launch a file chooser to select a file"
msgstr "Fájlkezelő indítása fájl kiválasztásához"
msgid "Select filename"
-msgstr "Válassz fájlnevet"
+msgstr "Fájlnév kijelölése"
msgid "Open Recent"
msgstr "Legutóbbi megnyitása"
@@ -9298,7 +9324,7 @@ msgid "Clear the list of recently opened files"
msgstr "Törli a legutóbb megnyitott fájlok listáját"
msgid "Saving layer to ''{0}'' ..."
-msgstr "Réget mentése ide: ''{0}'' ..."
+msgstr "Réget mentése ide: ''{0}''…"
msgid "Unsaved changes - Save/Upload before exiting?"
msgstr "Elmentetlen változtatások - Mented/feltöltöd kilépés előtt?"
@@ -9310,7 +9336,7 @@ msgid "Unsaved changes - Save/Upload before restarting?"
msgstr "Elmentetlen módosítások – Mented/feltöltöd az újraindítás előtt?"
msgid "Uploading and saving modified layers ..."
-msgstr "Módosított rétegek feltöltés és mentése ..."
+msgstr "Módosított rétegek feltöltés és mentése…"
msgid ""
"<html>{0} layer has unresolved conflicts.<br>Either resolve them first or "
@@ -9326,7 +9352,7 @@ msgstr[1] ""
"vagy vesd el a módosításokat.<br>Ütközéses rétegek:</html>"
msgid "Unsaved data and conflicts"
-msgstr "Mentetlen adat és konfliktusok"
+msgstr "Mentetlen adatok és ellentmondások"
msgid ""
"<html>{0} layer needs saving but has no associated file.<br>Either select a "
@@ -9345,7 +9371,7 @@ msgstr[1] ""
"rétegek:</html>"
msgid "Unsaved data and missing associated file"
-msgstr "Mentetlen adat és hiányzó hozzárendelt fájl"
+msgstr "Mentetlen adatok és hiányzó társított fájl"
msgid ""
"<html>{0} layer needs saving but has an associated file<br>which cannot be "
@@ -9356,13 +9382,13 @@ msgid_plural ""
"written.<br>Either select another file for each of them or discard the "
"changes.<br>Layers with non-writable files:</html>"
msgstr[0] ""
-"<html>Szükséges lenne a(z) {0} réteg mentése, de a hozzárendelt fájl<br>nem "
+"<html>Szükséges lenne a(z) {0} réteg mentése, de a társított fájl<br>nem "
"írható.<br>Válassz egy másik fájlt a rétegnek, vagy vesd el a "
"változtatásokat.<br>Nem írható fájlú réteg:</html>"
msgstr[1] ""
-"<html>Szükséges lenne a(z) {0} rétegek mentése, de a hozzárendelt "
-"fájlok<br>nem írhatóak.<br>Válassz egy másik fájlt minden rétegnek, vagy "
-"vesd el a változtatásokat.<br>Nem írható fájlú rétegek:</html>"
+"<html>Szükséges lenne a(z) {0} rétegek mentése, de a társított fájlok<br>nem "
+"írhatóak.<br>Válassz egy másik fájlt minden rétegnek, vagy vesd el a "
+"változtatásokat.<br>Nem írható fájlú rétegek:</html>"
msgid "Unsaved data non-writable files"
msgstr "Mentetlen adat, nem írható fájlok"
@@ -9414,7 +9440,7 @@ msgstr ""
"vesznek el."
msgid "Preparing layer ''{0}'' for upload ..."
-msgstr "''{0}'' réteg előkészítese feltöltéshez ..."
+msgstr "''{0}'' réteg előkészítese feltöltéshez…"
msgid ""
"<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -9462,7 +9488,7 @@ msgid "Layer ''{0}'' has no modifications to be saved."
msgstr "\"{0}\" rétegen nincsenek kimentendő változtatások."
msgid "Layer Name and File Path"
-msgstr "Rétegnév és fájl útvonal"
+msgstr "Rétegnév és fájlútvonal"
msgid "Recommended Actions"
msgstr "Javasolt műveletek"
@@ -9474,13 +9500,13 @@ msgid "Update objects"
msgstr "Objektumok frissítése"
msgid "Initializing nodes to update ..."
-msgstr "Pontok előkészítése frissítéshez ..."
+msgstr "Pontok előkészítése frissítéshez…"
msgid "Initializing ways to update ..."
-msgstr "Vonalak előkészítése frissítéshez ..."
+msgstr "Vonalak előkészítése frissítéshez…"
msgid "Initializing relations to update ..."
-msgstr "Kapcsolatok előkészítése frissítéshez ..."
+msgstr "Kapcsolatok előkészítése frissítéshez…"
msgid "Settings"
msgstr "Beállítások"
@@ -9497,8 +9523,7 @@ msgstr "Az adatok feltöltéséhez használt módosításcsomag címkéi"
msgid "Manage open changesets and select a changeset to upload to"
msgstr ""
-"Nyitott módosításcsomagok kezelése és módosításcsomag kiválasztása "
-"feltöltéshez"
+"Nyitott módosításcsomagok kezelése és módosításcsomag kijelölése feltöltéshez"
msgid "Configure advanced settings"
msgstr "Haladó beállítások"
@@ -9594,7 +9619,7 @@ msgstr ""
"feltöltés újrapróbálása."
msgid "Preparing objects to upload ..."
-msgstr "Objektumok előkészítése feltöltéshez ..."
+msgstr "Objektumok előkészítése feltöltéshez…"
msgid "Objects are uploaded to a <strong>new changeset</strong>."
msgstr ""
@@ -9729,8 +9754,8 @@ msgstr "''{0}'' objektum már törölve lett. Objektum átugrása feltöltésné
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
-msgstr[0] "{0} objektum feltöltése..."
-msgstr[1] "{0} objektum feltöltése..."
+msgstr[0] "{0} objektum feltöltése…"
+msgstr[1] "{0} objektum feltöltése…"
msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9746,7 +9771,7 @@ msgid ""
"be uploaded to the server.</html>"
msgstr ""
"<html>Jelöld ki feltöltésre a módosított objektumokat <strong>a "
-"kiválasztásból</strong>.</html>"
+"kijelölésből</strong>.</html>"
msgid ""
"<html>Mark <strong>locally deleted objects</strong> to be deleted on the "
@@ -9756,7 +9781,7 @@ msgstr ""
"törléshez.</html>"
msgid "Select objects to upload"
-msgstr "Objektumok kijelölése feltöltésre"
+msgstr "Feltöltendő objektumok kijelölése"
msgid "Cancel uploading"
msgstr "Feltöltés megszakítása"
@@ -9946,7 +9971,7 @@ msgid ""
"GPS tracks!"
msgstr ""
"A(z) „{0}” légifelvétel el lehet tolódva. Kérlek, ellenőrizd az elcsúszást "
-"GPS nyomvonalak segítségével!"
+"GPS-nyomvonalak segítségével!"
msgid "http://wiki.openstreetmap.org/wiki/Using_Imagery"
msgstr "http://wiki.openstreetmap.org/wiki/Using_Imagery"
@@ -10145,9 +10170,11 @@ msgid ""
"Reprojecting layer {0} from {1} to {2}. For best image quality and "
"performance, switch to one of the supported projections: {3}"
msgstr ""
+"{0} réteg átvetítése {1} vetületből {2} vetületbe. A legjobb képminőség és "
+"teljesítmény érdekében válts át az egyik támogatott vetületre: {3}"
msgid "Unable to find supported projection for layer {0}. Using {1}."
-msgstr ""
+msgstr "{0} réteghez nem található támogatott vetület. Használva: {1}."
msgid "Correlate to GPX"
msgstr "Korrelálás GPX-hez"
@@ -10168,7 +10195,7 @@ msgid "No images could be matched!"
msgstr "Nincsenek párosítható képek!"
msgid "GPX Files (*.gpx *.gpx.gz)"
-msgstr "GPX Fájlok (*.gpx *.gpx.gz)"
+msgstr "GPX-fájlok (*.gpx *.gpx.gz)"
msgid "File {0} is loaded yet under the name \"{1}\""
msgstr "{0} fájl már be van töltve ''{1}'' néven"
@@ -10184,7 +10211,7 @@ msgid ""
"time.<br>Display that photo here.<br>And then, simply capture the time you "
"read on the photo and select a timezone<hr></html>"
msgstr ""
-"<html>Készíts egy fényképet a GPS vevődről, miközben a pontos időt jeleníti "
+"<html>Készíts egy fényképet a GPS-vevődről, miközben a pontos időt jeleníti "
"meg.<br>Jelenítsd meg a képet itt.<br>Ezután olvasd le a pontos időt a "
"fényképről, írd be, és válaszd ki az időzónát.<hr></html>"
@@ -10192,7 +10219,7 @@ msgid "Photo time (from exif):"
msgstr "Fénykép ideje (exif adatokból):"
msgid "Gps time (read from the above photo): "
-msgstr "GPS idő (a fenti fényképről): "
+msgstr "GPS-idő (a fenti fényképről): "
msgid "I am in the timezone of: "
msgstr "Ebben az időzónában vagyok: "
@@ -10204,7 +10231,7 @@ msgid "Open another photo"
msgstr "Másik fotó megnyitása"
msgid "Synchronize time from a photo of the GPS receiver"
-msgstr "GPS vevő idejének szinkronizálása egy fénykép segítségével"
+msgstr "GPS-vevő idejének szinkronizálása egy fénykép segítségével"
msgid ""
"Error while parsing the date.\n"
@@ -10234,7 +10261,7 @@ msgid "Auto-Guess"
msgstr "Automata kitalálás"
msgid "Matches first photo with first gpx point"
-msgstr "Az első fényképet az első GPX ponthoz igazítja"
+msgstr "Az első fényképet az első GPX-ponthoz igazítja"
msgid "Manual adjust"
msgstr "Kézi igazítás"
@@ -10261,7 +10288,7 @@ msgid "Correlate"
msgstr "Korrelálás"
msgid "No gpx selected"
-msgstr "Nincs kiválasztott GPX"
+msgstr "Nincs kijelölt GPX"
msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
msgid_plural ""
@@ -10299,7 +10326,7 @@ msgid "Adjust timezone and offset"
msgstr "Időzóna és eltolás igazítása"
msgid "The selected photos do not contain time information."
-msgstr "A kiválasztott fényképek nem tartalmaznak idő információt."
+msgstr "A kijelölt fényképek nem tartalmaznak idő információt."
msgid "Photos do not contain time information"
msgstr "A fényképek nem tartalmaznak idő információt"
@@ -10308,7 +10335,7 @@ msgid ""
"The selected GPX track does not contain timestamps. Please select another "
"one."
msgstr ""
-"A kiválasztott GPX nyomvonal nem tartalmaz időbélyegeket. Kérlek válassz egy "
+"A kijelölt GPX nyomvonal nem tartalmaz időbélyegeket. Kérlek válassz egy "
"másikat."
msgid "GPX Track has no time information"
@@ -10318,22 +10345,22 @@ msgid "You should select a GPX track"
msgstr "Választanod kell egy GPX nyomvonalat"
msgid "No selected GPX track"
-msgstr "Nincs kiválasztott GPX nyomvonal"
+msgstr "Nincs kijelölt GPX nyomvonal"
msgid "Geotagged Images"
msgstr "Geotagelt képek"
msgid "Extracting GPS locations from EXIF"
-msgstr "GPS helyek kibontása az EXIF adatokból"
+msgstr "GPS-helyek kibontása az EXIF adatokból"
msgid "Starting directory scan"
msgstr "Könyvtárátvizsgálás indítása"
msgid "Read photos..."
-msgstr "Képek olvasása..."
+msgstr "Képek beolvasása…"
msgid "Reading {0}..."
-msgstr "{0} beolvasása..."
+msgstr "{0} beolvasása…"
msgid "Unable to get canonical path for directory {0}\n"
msgstr "Nem lehet meghatározni a(z) {0} könyvtár kanonikus útvonalát\n"
@@ -10345,7 +10372,7 @@ msgid "Error while getting files from directory {0}\n"
msgstr "{0} könyvtár olvasása közben hiba történt\n"
msgid "One of the selected files was null"
-msgstr "Az egyik kiválasztott fájl üres volt"
+msgstr "Az egyik kijelölt fájl üres volt"
msgid "{0} image loaded."
msgid_plural "{0} images loaded."
@@ -10354,13 +10381,13 @@ msgstr[1] "{0} kép betöltve."
msgid "{0} was found to be GPS tagged."
msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "{0} lett GPS címkézve"
-msgstr[1] "{0} lett GPS címkézve"
+msgstr[0] "{0} lett GPS-címkézve"
+msgstr[1] "{0} lett GPS-címkézve"
msgid "{0} has updated GPS data."
msgid_plural "{0} have updated GPS data."
-msgstr[0] "{0} frissített GPS adatot tartalmaz."
-msgstr[1] "{0} frissített GPS adatot tartalmaz."
+msgstr[0] "{0} frissített GPS-adatot tartalmaz."
+msgstr[1] "{0} frissített GPS-adatot tartalmaz."
msgid "Delete image file from disk"
msgstr "Kép törlése a lemezről"
@@ -10403,7 +10430,7 @@ msgid "Delete File from disk"
msgstr "Fájl törlése a lemezről"
msgid "Copy image path"
-msgstr "Kép útvonalának másolása"
+msgstr "Kép elérési útvonalának másolása"
msgid "Next"
msgstr "Következő"
@@ -10459,7 +10486,7 @@ msgid ""
"GPS time: {0}"
msgstr ""
"\n"
-"GPS idő: {0}"
+"GPS-idő: {0}"
msgid ""
"Error while parsing offset.\n"
@@ -10485,7 +10512,7 @@ msgid "Choose visible tracks"
msgstr "Látható nyomvonalak kiválasztása"
msgid "Select by date"
-msgstr "Kiválasztás dátum szerint"
+msgstr "Kijelölés dátum szerint"
msgid ""
"<html>Select all tracks that you want to be displayed. You can drag select a "
@@ -10513,7 +10540,7 @@ msgid ""
"<html>Upload of unprocessed GPS data as map data is considered "
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-"<html>Feldolgozatlan GPS adatok térképadatként való feltöltése káros "
+"<html>Feldolgozatlan GPS-adatok térképadatként való feltöltése káros "
"lehet.<br>Ha nyomvonalat szeretnél feltölteni, itt teheted:</html>"
msgid "Customize track drawing"
@@ -10529,10 +10556,10 @@ msgid "No timestamp"
msgstr "Időbélyeg nélküli"
msgid "Select to download OSM data."
-msgstr "Jelöld be az OSM térképi adatok letöltéséhez."
+msgstr "Jelöld be az OSM-adatok letöltéséhez."
msgid "Select to download GPS traces."
-msgstr "Jelöld be a GPS nyomvonalak letöltéséhez."
+msgstr "Jelöld be a GPS-nyomvonalak letöltéséhez."
msgid "Download everything within:"
msgstr "Minden letöltése ezen belül:"
@@ -10577,7 +10604,7 @@ msgid "Please select the imagery layer."
msgstr "Kérlek válassz légifelvétel-réteget."
msgid "Select imagery layer"
-msgstr "Légifelvétel-réteg választása"
+msgstr "Légifelvétel-réteg kijelölése"
msgid "There are no imagery layers."
msgstr "Nincsenek légifelvétel-rétegek."
@@ -10601,7 +10628,7 @@ msgid "Velocity, {0}"
msgstr "Sebesség, {0}"
msgid "Audio files (*.wav, *.mp3, *.aac, *.aif, *.aiff)"
-msgstr ""
+msgstr "Audio fájlok (*.wav, *.mp3, *.aac, *.aif, *.aiff)"
msgid "Import Audio"
msgstr "Hang importálása"
@@ -10757,10 +10784,10 @@ msgid "(URL was: "
msgstr "(Az URL: "
msgid "Select the map painting styles"
-msgstr "Térképrajz stílusának kiválasztása"
+msgstr "Térképrajz stílusának kijelölése"
msgid "loading style ''{0}''..."
-msgstr "stílus betöltése: ''{0}''..."
+msgstr "stílus betöltése: ''{0}''…"
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
@@ -11026,9 +11053,9 @@ msgid ""
"With OAuth you grant JOSM the right to upload map data and GPS tracks on "
"your behalf (<a href=\"{0}\">more info...</a>)."
msgstr ""
-"Az OAuthtal jogosultságot adsz a JOSM-nak, hogy térképi adatokat és GPS "
+"Az OAuthtal jogosultságot adsz a JOSM-nak, hogy térképi adatokat és GPS-"
"nyomvonalat töltsön fel a nevedben (<a href=\"{0}\">további "
-"információk...</a>)."
+"információk…</a>)."
msgid "Please select an authorization procedure: "
msgstr "Válassz egy azonosítási folyamatot: "
@@ -11072,19 +11099,19 @@ msgid "Failed to authorize OAuth request ''{0}''"
msgstr "Nem sikerült az OAuth kérés jóváhagyása: \"{0}\""
msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr "Az OAuth Kérelem Token \"{0}\" jováhagyása az OSM weboldalon..."
+msgstr "Az OAuth Kérelem Token \"{0}\" jováhagyása az OSM weboldalon…"
msgid "Initializing a session at the OSM website..."
-msgstr "Munkafolyamat megnyitása az OSM weboldalon..."
+msgstr "Munkafolyamat megnyitása az OSM weboldalon…"
msgid "Authenticating the session for user ''{0}''..."
-msgstr "A munkafolyamat azonosítása \"{0}\" felhasználóként..."
+msgstr "A munkafolyamat azonosítása \"{0}\" felhasználóként…"
msgid "Authorizing request token ''{0}''..."
-msgstr "A kérelmi token \"{0}\" jóváhagyása..."
+msgstr "A kérelmi token \"{0}\" jóváhagyása…"
msgid "Logging out session ''{0}''..."
-msgstr "Kijelentkezés a munkafolyamatból \"{0}\"..."
+msgstr "Kijelentkezés a munkafolyamatból \"{0}\"…"
msgid "Allow to upload map data"
msgstr "Térképadatok feltöltésének engedélyezése"
@@ -11093,20 +11120,19 @@ msgid "Select to grant JOSM the right to upload map data on your behalf"
msgstr "Válaszd ki, hogy a JOSM a nevedben térképi adatokat tölthessen fel"
msgid "Allow to upload GPS traces"
-msgstr "GPS nyomvonalak feltöltésének engedélyezése"
+msgstr "GPS-nyomvonalak feltöltésének engedélyezése"
msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
-msgstr "Válaszd ki, hogy a JOSM a nevedben GPS nyomvonalakat tölthessen fel"
+msgstr "Válaszd ki, hogy a JOSM a nevedben GPS-nyomvonalakat tölthessen fel"
msgid "Allow to download your private GPS traces"
-msgstr "Saját GPS nyomvonalak letöltésének engedélyezése"
+msgstr "Saját GPS-nyomvonalak letöltésének engedélyezése"
msgid ""
"Select to grant JOSM the right to download your private GPS traces into JOSM "
"layers"
msgstr ""
-"Válaszd ki, hogy a JOSM a saját GPS nyomvonalaidat JOSM rétegekre tölthesse "
-"le"
+"Jelöld ki, hogy a JOSM a saját GPS-nyomvonalaidat JOSM rétegekre tölthesse le"
msgid "Allow to read your preferences"
msgstr "Saját beállítások olvasásának engedélyezése"
@@ -11127,7 +11153,7 @@ msgid "Select to grant JOSM the right to modify notes on your behalf"
msgstr "Válaszd ki, hogy a JOSM a nevedben a jegyzeteket módosítsa"
msgid "Retrieving OAuth Access Token..."
-msgstr "OAuth Elérési Token fogadása..."
+msgstr "OAuth Elérési Token fogadása…"
msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
msgstr "<html>Az OAuth Elérési Token fogadása nem sikerült ''{0}''.</html>"
@@ -11136,7 +11162,7 @@ msgid "Request Failed"
msgstr "Kérelem sikertelen"
msgid "Retrieving OAuth Request Token..."
-msgstr "OAuth Kérelmi Token fogadása..."
+msgstr "OAuth Kérelmi Token fogadása…"
msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
msgstr "<html>Az OAuth Kérelmi Token fogadása nem sikerült ''{0}''.</html>"
@@ -11251,7 +11277,7 @@ msgstr ""
"<html>A \"{1}\" Elérési Token ismert az OSM szerver számára "
"(\"{0}\").<br>Habár, a felhasználói adatok letöltése ezzel a tokennel "
"meghiúsult.<br>Attól függően, hogy milyen jogosultságokat biztosítottál "
-"ennek a tokennek, lehetséges lehet<br>térpép adatok vagy GPS nyomvonalak "
+"ennek a tokennek, lehetséges lehet<br>térpép adatok vagy GPS-nyomvonalak "
"feltöltése és egyéb védett funkciók elérése.</html>"
msgid "Token allows restricted access"
@@ -11286,7 +11312,7 @@ msgstr ""
"később.</html>"
msgid "Retrieving user info..."
-msgstr "Felhasználói adatok fogadása..."
+msgstr "Felhasználói adatok fogadása…"
msgid "Expert mode"
msgstr "Szakértő mód"
@@ -11307,7 +11333,7 @@ msgid "Download plugins"
msgstr "Bővítmények letöltése"
msgid "Icon paths:"
-msgstr "Ikon könyvtár:"
+msgstr "Ikon elérési útvonalai:"
msgid "Short Description:"
msgstr "Rövid leírás:"
@@ -11370,13 +11396,13 @@ msgid "Reset to default"
msgstr "Visszaállítás az alapértelmezettre"
msgid "Add a new icon path"
-msgstr "Új ikon könyvtár hozzáadása"
+msgstr "Új ikonelérési útvonal hozzáadása"
msgid "Remove the selected icon paths"
-msgstr "A kiválasztott ikon könyvtár eltávolítása"
+msgstr "A kijelölt ikonelérési útvonal eltávolítása"
msgid "Edit the selected icon path"
-msgstr "A kiválasztott ikon könyvtár szerkesztése"
+msgstr "A kijelölt ikonelérési útvonal szerkesztése"
msgid "Tooltip"
msgstr "Buboréksúgó"
@@ -11483,7 +11509,7 @@ msgid "Append preferences from file to existing values"
msgstr "Beállítások hozzáfűzése a fájlból a meglévő értékekhez"
msgid "Replace existing values"
-msgstr "Meglévő értékek lecserélése"
+msgstr "Meglévő értékek kicserélése"
msgid "Open JOSM customization file"
msgstr "JOSM beállításfájl megnyitása"
@@ -11554,7 +11580,7 @@ msgid "Please select the row to edit."
msgstr "Kérlek válassz szerkesztendő sort."
msgid "Select Setting Type:"
-msgstr "Válassz beállítás típust:"
+msgstr "Beállítástípus kijelölése:"
msgid "Simple"
msgstr "Egyszerű"
@@ -11737,13 +11763,13 @@ msgid "Draw segment order numbers"
msgstr "Szakaszsorrend számok rajzolása"
msgid "Draw segment order numbers on selected way"
-msgstr "Szakaszsorrend számok rajzolása a kiválasztott vonalra"
+msgstr "Szakaszsorrend számok rajzolása a kijelölt vonalra"
msgid "Draw boundaries of downloaded data"
msgstr "A letöltött adatok határvonalának kirajzolása"
msgid "Draw virtual nodes in select mode"
-msgstr "Virtuális pontok rajzolása kiválasztás módban"
+msgstr "Virtuális pontok rajzolása kijelölés módban"
msgid "Draw inactive layers in other color"
msgstr "Inaktív rétegek rajzolása más színnel"
@@ -11752,7 +11778,7 @@ msgid "Display discardable keys"
msgstr "Eldobhatónak ítélt kulcsok megjelenítése"
msgid "Use auto filters"
-msgstr ""
+msgstr "Auto szűrők használata"
msgid "Rule"
msgstr ""
@@ -11773,7 +11799,7 @@ msgid "Draw only outlines of areas"
msgstr "Területeknél csak körvonal rajzolása"
msgid "GPS Points"
-msgstr "GPS pontok"
+msgstr "GPS-pontok"
msgid "Draw direction hints for way segments."
msgstr "A vonalszakaszok irányának megjelenítése."
@@ -11808,13 +11834,13 @@ msgstr ""
msgid "Hightlight target nodes and ways while drawing or selecting"
msgstr ""
-"Egér alatt lévő vonalak és pontok kiemelése rajzolás és kiválasztás közben"
+"Egér alatt lévő vonalak és pontok kiemelése rajzolás vagy kijelölés közben"
msgid ""
"This option suppresses the filling of areas, overriding anything specified "
"in the selected style."
msgstr ""
-"Ez a beállítás meggátolja a területek kitöltését, felülírva a kiválasztott "
+"Ez a beállítás meggátolja a területek kitöltését, felülírva a kijelölt "
"stílus rajzolását."
msgid ""
@@ -11827,6 +11853,8 @@ msgstr ""
msgid ""
"Display buttons to automatically filter numeric values of a predefined tag"
msgstr ""
+"Gombokat jelenít meg, amikkel az előre megadott címkék numerikus értékei "
+"szűrhetőek automatikusan"
msgid "Options that affect drawing performance"
msgstr "Rajzolási teljesítményt befolyásoló beállítások"
@@ -11835,7 +11863,7 @@ msgid "Segment drawing options"
msgstr "Szakaszrajzolás beállításai"
msgid "Select and draw mode options"
-msgstr "Kiválasztás és rajzolás mód beállításai"
+msgstr "Kijelölés és rajzolás mód beállításai"
msgid "Other options"
msgstr "Egyéb beállítások"
@@ -11879,7 +11907,7 @@ msgid "Force lines if no segments imported"
msgstr "Vonalak kényszerítése, ha nincsenek importált szakaszok"
msgid "Draw large GPS points"
-msgstr "Nagy GPS pontok rajzolása"
+msgstr "Nagy GPS-pontok rajzolása"
msgid "Draw a circle from HDOP value"
msgstr "Körök rajzolás HDOP érték alapján"
@@ -11943,7 +11971,7 @@ msgid "Use points instead of lines for heat map"
msgstr "Vonalak helyett pontok megjelenítése a hőtérképen"
msgid "Create markers when reading GPX"
-msgstr "Helyjelzők készítése a GPS olvasásakor"
+msgstr "Helyjelzők készítése a GPX olvasásakor"
msgid "Fast drawing (looks uglier)"
msgstr "Gyors rajzolás (csúnyábban néz ki)"
@@ -11965,7 +11993,7 @@ msgstr ""
"útpontok alapján."
msgid "Draw lines between raw GPS points"
-msgstr "Vonalak rajzolása a nyers GPS pontok között"
+msgstr "Vonalak rajzolása a nyers GPS-pontok között"
msgid ""
"Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11993,7 +12021,7 @@ msgstr ""
"tartalmaznak vonalinformációkat."
msgid "Draw direction arrows for lines, connecting GPS points."
-msgstr "Irányjelző nyilak rajzolása a GPS pontokat összekötő vonalakra."
+msgstr "Irányjelző nyilak rajzolása a GPS-pontokat összekötő vonalakra."
msgid ""
"Draw the direction arrows using table lookups instead of complex math."
@@ -12067,7 +12095,7 @@ msgid "Allows to tune the track coloring for different average speeds."
msgstr "Lehetővé teszi a színezés hangolását különböző sebességekhez."
msgid "Selects the color schema for heat map."
-msgstr "Kiválasztja a hőtérkép színösszeállítását"
+msgstr "A hőtértkép színsémájának kijelölése"
msgid "Track and Point Coloring"
msgstr "Nyomvonal és pontok színezése"
@@ -12111,10 +12139,10 @@ msgid "Show splash screen at startup"
msgstr "Nyitóképernyő megjelenítése indításkor"
msgid "Show object ID in selection lists"
-msgstr "objektum ID megjelentése a kiválasztási listában"
+msgstr "Objektum-ID megjelentése a kijelölési listában"
msgid "Show localized name in selection lists"
-msgstr "Lokalizált nevek a kiválasztási listában"
+msgstr "Lokalizált nevek a kijelölési listában"
msgid "Modeless working (Potlatch style)"
msgstr "Módváltás nélküli munka (Potlatch stílus)"
@@ -12136,7 +12164,7 @@ msgid "Intermediate steps between native resolutions"
msgstr "Köztes zoomszintek a natív felbontások között"
msgid "Show localized name in selection lists, if available"
-msgstr "Lokalizált név megjelenítése a kiválasztási listában, ha elérhető"
+msgstr "Lokalizált név megjelenítése a kijelölési listában, ha elérhető"
msgid "Do not require to switch modes (potlatch style workflow)"
msgstr "A rajzolás nem igényel módváltást (Potlatch stílusú munka)"
@@ -12224,8 +12252,8 @@ msgid ""
"{0} is replaced by a random selection from the given comma separated list, "
"e.g. {1}"
msgstr ""
-"{0} lecserélve a vesszővel elválasztott lista egy véletlenszerűen "
-"kiválasztott tagjára, pl. {1}"
+"{0} lecserélve a vesszővel elválasztott lista egy véletlenszerű "
+"kijelölésére, pl. {1}"
msgid "2. Enter maximum zoom (optional)"
msgstr "2. Maximum zoom megadás (opcionális)"
@@ -12249,10 +12277,10 @@ msgid "Get layers"
msgstr "Rétegek lekérése"
msgid "2. Select layers"
-msgstr "2. Rétegek kiválasztása"
+msgstr "2. Rétegek kijelölése"
msgid "3. Select image format"
-msgstr "3. Képformátum kiválasztása"
+msgstr "3. Képformátum kijelölés"
msgid "4. Verify generated WMS URL"
msgstr "4. Generált WMS URL ellenőrzése"
@@ -12331,9 +12359,10 @@ msgstr "Elérhető alapértelmezett bejegyzések:"
msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
msgstr ""
+"Új alapértelmezett bejegyzések megadhatóak a <a href=\"{0}\">Wikiben</a>."
msgid "Selected entries:"
-msgstr "Kiválasztott bejegyzések:"
+msgstr "Kijelölt bejegyzések:"
msgid "Add a new {0} entry by entering the URL"
msgstr "Új {0} bejegyzés készítése URL megadással"
@@ -12342,7 +12371,7 @@ msgid "Remove entry"
msgstr "Bejegyzés eltávolítása"
msgid "copy selected defaults"
-msgstr "kiválasztott alapértelmezettek másolása"
+msgstr "kijelölt alapértelmezettek másolása"
msgid "Please select at least one row to copy."
msgstr "Kérlek válassz legalább egy másolandó sort."
@@ -12473,14 +12502,13 @@ msgid "New style entry:"
msgstr "Új stílusbejegyzés:"
msgid "Remove the selected styles from the list of active styles"
-msgstr "A kiválasztott stílus eltávolítása az aktív stílusok listájából"
+msgstr "A kijelölt stílusok eltávolítása az aktív stílusok listájából"
msgid "Edit the filename or URL for the selected active style"
-msgstr "A kiválasztott aktív stílus fájlnevének vagy URL-jének szerkesztése"
+msgstr "A kijelölt aktív stílus fájlnevének vagy URL-jének szerkesztése"
msgid "Add the selected available styles to the list of active styles"
-msgstr ""
-"A kiválasztott elérhető stílusok hozzáadása az aktív stílusok listájához"
+msgstr "A kijelölt elérhető stílusok hozzáadása az aktív stílusok listájához"
msgid "Reloads the list of available styles from ''{0}''"
msgstr "Az elérhető stílusok listájának frissítése innen: \"{0}\""
@@ -12685,7 +12713,7 @@ msgid "Download the list of available plugins"
msgstr "Elérhető bővítmények listájának letöltése"
msgid "Update the selected plugins"
-msgstr "Kiválasztott bővítmények frissítése"
+msgstr "Kijelölt bővítmények frissítése"
msgid ""
"All installed plugins are up to date. JOSM does not have to download newer "
@@ -12829,7 +12857,7 @@ msgid "Projection bounds (in degrees)"
msgstr "Vetület határok (fokban)"
msgid "Sets the SRS=... parameter in the WMS request"
-msgstr "SRS=... paraméter beállítása a WMS kérésben"
+msgstr "SRS=… paraméter beállítása a WMS kérésben"
msgid "Gauß-Krüger"
msgstr "Gauß-Krüger"
@@ -12886,13 +12914,13 @@ msgid "Projection method"
msgstr "Velületi rendszer"
msgid "Set as default"
-msgstr ""
+msgstr "Beállítás alapértelmezettként"
msgid "Default projection"
-msgstr ""
+msgstr "Alapértelmezett vetület"
msgid "Default projection has been set to ''{0}''"
-msgstr ""
+msgstr "„{0}” lett az alapértelmezett vetület"
msgid "Display coordinates as"
msgstr "Koordináták megjelenítése mint"
@@ -12922,7 +12950,7 @@ msgid "Swiss Grid (Switzerland)"
msgstr "Svájci rács (Svjác)"
msgid "<i>CH1903 / LV03</i>"
-msgstr ""
+msgstr "<i>CH1903 / LV03</i>"
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort-Marigot 1949"
@@ -13322,13 +13350,15 @@ msgid "New rule entry:"
msgstr "Új szabály megadása:"
msgid "Remove the selected rules from the list of active rules"
-msgstr "Kiválasztott szabályok eltávolítása az aktív szabályok közül."
+msgstr "Kijelölt szabályok eltávolítása az aktív szabályok közül."
msgid "Edit the filename or URL for the selected active rule"
-msgstr "A kiválasztott szabályokhoz kapcsolódó fájlnév vagy URL módosítása."
+msgstr ""
+"A kijelölt aktív szabályhoz kapcsolódó fájlnév vagy URL szerkesztése."
msgid "Add the selected available rules to the list of active rules"
-msgstr "A kiválasztott szabályok hozzáadása az aktív szabályok listájához."
+msgstr ""
+"A kijelölt elérhető szabályok hozzáadása az aktív szabályok listájához."
msgid "Reloads the list of available rules from ''{0}''"
msgstr "Az elérhető szabályok listájának újratöltése a ''{0}'' helyről"
@@ -13358,10 +13388,10 @@ msgid "Checks for missing tag or suspicious combinations"
msgstr "Hiányzó vagy gyanús cimke kombinációk vizsgálata"
msgid "Deprecated features"
-msgstr "Eltávolított szolgáltatások"
+msgstr "Elavult elemek"
msgid "Checks for deprecated features"
-msgstr "Elavult funkciók utáni vizsgálat"
+msgstr "Elavult elemek keresése"
msgid "Geometry"
msgstr "Geometria"
@@ -13415,7 +13445,7 @@ msgid "Tag checker rules"
msgstr "Cimke vizsgálati szabályok"
msgid "Choose Tag checker rules to enable"
-msgstr "Cimke ellenörző szabályok kiválasztása az engedélyezéshez"
+msgstr "Cimkeellenörző szabályok kiválasztása az engedélyezéshez"
msgid "Use ignore list."
msgstr "Kivétellista használata."
@@ -13463,7 +13493,7 @@ msgstr[0] "Régi kulcsok eltávolítása {0} objektumról"
msgstr[1] "Régi kulcsok eltávolítása több ({0}) objektumról"
msgid "Delete the selection in the tag table"
-msgstr "A kiválasztottak törlése a cimke táblázatból"
+msgstr "A kijelölés törlése a cimketáblázatból"
msgid "Add a new tag"
msgstr "Új címke hozzáadása"
@@ -13484,7 +13514,7 @@ msgid "This preset also sets: {0}"
msgstr "Ez a címkekészlet ezt is beállítja: {0}"
msgid "Edit also …"
-msgstr "Szintén szerkesztendő..."
+msgstr "Szintén szerkesztendő…"
msgid "Apply Preset"
msgstr "Címkék alkalmazása"
@@ -13495,12 +13525,12 @@ msgstr "Új kapcsolat"
msgid ""
"The preset <i>{0}</i> cannot be applied since nothing has been selected!"
msgstr ""
-"<i>{0}</i> címkekészlet nem alkalmazható, mert nincs semmi kiválasztva!"
+"<i>{0}</i> címkekészlet nem alkalmazható, mert nincs semmi kijelölve."
msgid ""
"The preset <i>{0}</i> cannot be applied since the selection is unsuitable!"
msgstr ""
-"<i>{0}</i> címkekészlet nem alkalmazható, mert a kiválasztás nem hozzá illő!"
+"<i>{0}</i> címkekészlet nem alkalmazható, mert a kijelölés nem hozzá illő!"
msgid "Change {0} object"
msgid_plural "Change {0} objects"
@@ -13508,10 +13538,10 @@ msgstr[0] "{0} objektum módosítása"
msgstr[1] "{0} objektum módosítása"
msgid "Nothing selected!"
-msgstr "Semmi sincs kiválasztva!"
+msgstr "Semmi sincs kijelölve!"
msgid "Selection unsuitable!"
-msgstr "A kiválasztás alkalmatlan!"
+msgstr "A kijelölés alkalmatlan!"
msgid "Change Tags"
msgstr "Cimkék módosítása"
@@ -13557,7 +13587,7 @@ msgid "Presets"
msgstr "Címkék"
msgid "Search for objects by preset..."
-msgstr "Objektum keresése címke alapján..."
+msgstr "Objektum keresése címke alapján…"
msgid "Search for objects by preset"
msgstr "Objektumok keresése címkekészlet alapján"
@@ -13701,10 +13731,10 @@ msgid "Add a new source to the list."
msgstr "Új forrás hozzáadása a listához"
msgid "Edit the selected source."
-msgstr "Kiválasztott forrás szerkesztése."
+msgstr "Kijelölt forrás szerkesztése."
msgid "Delete the selected source from the list."
-msgstr "Kiválasztott forrás törlése a listából."
+msgstr "Kijelölt forrás törlése a listából."
msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
@@ -13727,15 +13757,14 @@ msgstr "igaz: a ''{0}'' tulajdonság határozottan be van kapcsolva"
msgid ""
"partial: different selected objects have different values, do not change"
msgstr ""
-"részleges: különböző kiválasztott objektumoknak különböző értékük van, ne "
+"részleges: különböző kijelölt objektumoknak különböző értékük van, ne "
"változtasd"
msgid ""
"partial: different selected objects have different values for ''{0}'', do "
"not change"
msgstr ""
-"részleges: a különböző kiválasztott objektumok „{0}” értéke eltér, ne "
-"módosítsd"
+"részleges: a különböző kijelölt objektumok „{0}” értéke eltér, ne módosítsd"
msgid "unset: do not set this property on the selected objects"
msgstr ""
@@ -13815,10 +13844,10 @@ msgid "All Formats"
msgstr "Minden formátum"
msgid "Downloading points {0} to {1}..."
-msgstr "{0} és {1} közötti pontok letöltése folyamatban..."
+msgstr "{0} és {1} közötti pontok letöltése folyamatban…"
msgid "Contacting OSM Server..."
-msgstr "Kapcsolódás az OSM szerverhez..."
+msgstr "Kapcsolódás az OSM szerverhez…"
msgid "Downloading notes"
msgstr "Jegyzetek letöltése"
@@ -13868,7 +13897,7 @@ msgid ""
"Unexpected format of error header for conflict in changeset update. Got "
"''{0}''"
msgstr ""
-"A frissítendő módosítási csomag konfliktusáról ismeretlen fejlécű hibafejléc "
+"A frissítendő módosításcsomag konfliktusáról ismeretlen fejlécű hibafejléc "
"érkezett. ''{0}'' jött"
msgid "Illegal longitude value for parameter ''{0}'', got {1}"
@@ -13881,20 +13910,19 @@ msgstr ""
msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
msgstr ""
-"A módosítási csomag lekérdező URL-ben nem várt érték a(z) ''{0}''-hoz, {1} "
-"jött"
+"A módosításcsomag lekérdező URL-ben nem várt érték a(z) ''{0}''-hoz, {1} jött"
msgid ""
"Cannot create a changeset query including both the query parameters ''uid'' "
"and ''display_name''"
msgstr ""
"Két paraméterrel egyszerre (''uid'' és ''display_name'') nem lehet "
-"módosítási csomagot lekérdezni"
+"módosításcsomagot lekérdezni"
msgid "Unsupported parameter ''{0}'' in changeset query string"
msgstr ""
-"A módosítási csomag lekérdező karakterláncban nem támogatott ''{0}'' "
-"paraméter jött"
+"A módosításcsomag lekérdező karakterláncban nem támogatott ''{0}'' paraméter "
+"jött"
msgid "Unexpected format for port number in preference ''{0}''. Got ''{1}''."
msgstr "nem várt port szám a ''{0}'' beállításban. ''{1}'' jött."
@@ -13940,7 +13968,7 @@ msgstr ""
"indulás során. Proxy nem lesz használatban."
msgid "Parsing response from server..."
-msgstr "Szerver válasz feldolgozás..."
+msgstr "Szerver válasz feldolgozás…"
msgid "Unexpected XML element with name ''{0}''"
msgstr "Váratlan XML elem ''{0}'' névvel"
@@ -13975,7 +14003,7 @@ msgstr ""
"szerint licencelt nyomvonalakat."
msgid "GPS track description"
-msgstr "GPS nyomvonal leírása"
+msgstr "GPS-nyomvonal leírása"
msgid "Add author information"
msgstr "Szerzői információk hozzáadása"
@@ -14024,14 +14052,14 @@ msgid ""
"Error occurred while parsing gpx data for layer ''{0}''. Only a part of the "
"file will be available."
msgstr ""
-"GPX adathiba történt a ''{0}'' réteg feldolgozása során. Csak a fájl egy "
+"GPX-adathiba történt a ''{0}'' réteg feldolgozása során. Csak a fájl egy "
"része lesz elérhető."
msgid ""
"Error occurred while parsing gpx file ''{0}''. Only a part of the file will "
"be available."
msgstr ""
-"Hiba történt a GPX fájl feldolgozása során ''{0}''. Csak a fájl egy része "
+"Hiba történt a GPX-fájl feldolgozása során ''{0}''. Csak a fájl egy része "
"lesz elérhető."
msgid "Parse error: invalid document structure for GPX document."
@@ -14094,7 +14122,7 @@ msgstr ""
"kérés indul."
msgid "Downloading OSM data..."
-msgstr "OSM adatok letöltése..."
+msgstr "OSM adatok letöltése…"
msgid "Fetching node with id {0} from ''{1}''"
msgstr "{0} azonosítójú pont lekérése innen: \"{1}\""
@@ -14176,7 +14204,7 @@ msgstr ""
"A módosított ''{0}'' elem új verziójának formátuma nem ismert. ''{1}'' jött."
msgid "Creating changeset..."
-msgstr "Módosításcsomag készítése..."
+msgstr "Módosításcsomag készítése…"
msgid "Successfully opened changeset {0}"
msgstr "{0} módosításcsomag sikeresen megnyitva."
@@ -14185,25 +14213,25 @@ msgid "Changeset ID > 0 expected. Got {0}."
msgstr "Várt módosításcsomag ID > 0. Kapott: {0}."
msgid "Updating changeset..."
-msgstr "Módosításcsomag frissítése..."
+msgstr "Módosításcsomag frissítése…"
msgid "Updating changeset {0}..."
-msgstr "Módosításcsomag {0} frissítése..."
+msgstr "Módosításcsomag {0} frissítése…"
msgid "Closing changeset..."
-msgstr "Módosításcsomag lezárása..."
+msgstr "Módosításcsomag lezárása…"
msgid "No changeset present for diff upload."
msgstr "Nincs jelen módosításcsomag a különbözet feltöltéséhez."
msgid "Preparing upload request..."
-msgstr "Előkészület a kérés feltöltésére..."
+msgstr "Előkészület a kérés feltöltésére…"
msgid "Waiting 10 seconds ... "
-msgstr "Várakozás 10 másodpercig... "
+msgstr "Várakozás 10 másodpercig… "
msgid "Starting retry {0} of {1} in {2} seconds ..."
-msgstr "Újrapróbálkozás {0}/{1}, {2} másodperc múlva ..."
+msgstr "Újrapróbálkozás {0}/{1}, {2} másodperc múlva…"
msgid "OK - trying again."
msgstr "OK - ismételt próba."
@@ -14212,11 +14240,11 @@ msgid "Starting retry {0} of {1}."
msgstr "Újrapróbálkozás {0}/{1}."
msgid "Current changeset is null. Cannot upload data."
-msgstr "Az aktuális változáscsomag üres. Adatfeltöltés nem lehetséges."
+msgstr "Az aktuális módosításcsomag üres. Adatfeltöltés nem lehetséges."
msgid "ID of current changeset > 0 required. Current ID is {0}."
msgstr ""
-"Az aktuális módosítási csomag ID-jának > 0 kell legyen. Az aktuális ID {0}."
+"Az aktuális módosításcsomag ID-jának > 0 kell legyen. Az aktuális ID {0}."
msgid "Open changeset expected. Got closed changeset with id {0}."
msgstr ""
@@ -14282,7 +14310,7 @@ msgstr ""
"({1},{2}) pozícióban. Kihagyás."
msgid "Parsing changeset content ..."
-msgstr "Módosításcsomag tartalmi elemzése..."
+msgstr "Módosításcsomag tartalmi elemzése…"
msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
msgstr "Helytelen logikai érték a(z) ''{0}'' jellemzőhöz. Kapott: ''{1}''."
@@ -14300,7 +14328,7 @@ msgid "Undefined element ''{0}'' found in input stream. Aborting."
msgstr "Nem definiált elem ''{0}'' volt a bejövő adatfolyamban. Megszakítás."
msgid "Parsing list of changesets..."
-msgstr "Módosításcsomagok listájának elemzése..."
+msgstr "Módosításcsomagok listájának elemzése…"
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr "A HTTP kapcsolat aláírása meghiúsult az OAuth hitelesítési fejléccel"
@@ -14325,7 +14353,7 @@ msgid "OSM Server Files gzip compressed"
msgstr "Az OSM szerver fájlok zip tömörítettek"
msgid "Parsing OSM history data ..."
-msgstr "OSM adattörténet feldolgozása..."
+msgstr "OSM előzményadatok feldolgozása…"
msgid "Invalid dataset"
msgstr "Érvénytelen adathalmaz"
@@ -14473,10 +14501,10 @@ msgid "Downloading history..."
msgstr "Előzmények letöltése…"
msgid "Contacting Server..."
-msgstr "Kapcsolódás a szerverhez..."
+msgstr "Kapcsolódás a szerverhez…"
msgid "Downloading OSM notes..."
-msgstr "OSM jegyzetek letöltése..."
+msgstr "OSM jegyzetek letöltése…"
msgid ""
"Could not connect to the OSM server. Please check your internet connection."
@@ -14501,8 +14529,11 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Felhasználói adatok olvasása…"
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
-msgstr "Elemenként egy kérés felküldésének megkezdése..."
+msgstr "Elemenként egy kérés felküldésének megkezdése…"
msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
msgstr "{0}% ({1}/{2}), {3} maradt. Pont feltöltése ''{4}'' (id: {5})"
@@ -14514,19 +14545,19 @@ msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
msgstr "{0}% ({1}/{2}), {3} maradt. Kapcsolat feltöltése ''{4}'' (id: {5})"
msgid "Starting to upload in one request ..."
-msgstr "Feltöltés megkezdése egyetlen kérésként..."
+msgstr "Feltöltés megkezdése egyetlen kérésként…"
msgid "Value >0 expected for parameter ''{0}'', got {1}"
msgstr ""
"Nullától nagyobb (>0) érték elvárt a(z) ''{0}'' paraméterhez, {1} érkezett"
msgid "Starting to upload in chunks..."
-msgstr "Feltöltés megkezdése nagy darabokban..."
+msgstr "Feltöltés megkezdése nagy darabokban…"
msgid "({0}/{1}) Uploading {2} object..."
msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] "({0}/{1}) {2} objektum feltöltése..."
-msgstr[1] "({0}/{1}) {2} objektum feltöltése..."
+msgstr[0] "({0}/{1}) {2} objektum feltöltése…"
+msgstr[1] "({0}/{1}) {2} objektum feltöltése…"
msgid "Uploading data ..."
msgstr "Adatok feltöltése…"
@@ -14538,7 +14569,7 @@ msgid "Failed to evaluate {0}"
msgstr "Nem sikerült kiértékelni: {0}"
msgid "Downloading data..."
-msgstr "Adatok letöltése..."
+msgstr "Adatok letöltése…"
msgid "WMS Files (*.wms)"
msgstr "WMS fájlok (*.wms)"
@@ -14586,19 +14617,19 @@ msgid "Old values of"
msgstr "A régi értékek"
msgid "Add tags to selected objects"
-msgstr "Cimkék hozzáadása a kiválasztott objektumokhoz"
+msgstr "Cimkék hozzáadása a kijelölt objektumokhoz"
msgid "Add selected tags"
-msgstr "Kiválasztott cimkék hozzáadása"
+msgstr "Kijelölt cimkék hozzáadása"
msgid "Add all tags"
msgstr "Az összes címke hozzáadása"
msgid "Add checked tags to selected objects"
-msgstr "A kijelölt címkék hozzáadása a kiválasztott objektumokhoz"
+msgstr "Ellenőrzött címkék hozzáadása a kijelölt objektumokhoz"
msgid "Shift+Enter: Add all tags to selected objects"
-msgstr "Shift+Enter: Minden címke hozzáadása a kiválasztott objektumokhoz"
+msgstr "Shift+Enter: Minden címke hozzáadása a kijelölt objektumokhoz"
msgid "Enable the checkbox to accept the value"
msgstr "Fogadd el az értéket a jelölődoboz engedélyezésével"
@@ -14785,7 +14816,7 @@ msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
"0.1"
msgstr ""
-"A gpx nyomvonal réteghez ''{0}'' verziójú metaadatok nem támogatottak. "
+"A GPX-nyomvonal réteghez ''{0}'' verziójú metaadatok nem támogatottak. "
"Elvárt: 0.1"
msgid "File name expected for layer no. {0}"
@@ -15509,14 +15540,14 @@ msgid ""
"<html>Closing of changeset <strong>{0}</strong> failed <br>because it has "
"already been closed."
msgstr ""
-"<html>A módosítási csomag lezárása <strong>{0}</strong> meghiúsult, <br>mert "
+"<html>A módosításcsomag lezárása <strong>{0}</strong> meghiúsult, <br>mert "
"már rendben le lett zárva."
msgid ""
"<html>Closing of changeset <strong>{0}</strong> failed<br> because it has "
"already been closed on {1}."
msgstr ""
-"<html>A módosítási csomag lezárása <strong>{0}</strong> meghiúsult, <br>mert "
+"<html>A módosításcsomag lezárása <strong>{0}</strong> meghiúsult, <br>mert "
"már rendben le lett zárva, {1}."
msgid ""
@@ -15556,7 +15587,7 @@ msgid ""
"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
"problem with transferring data.<br>Details (untranslated): {1}</html>"
msgstr ""
-"<html>Egy adatátviteli probléma miatt az adat fel- és/vagy letöltés "
+"<html>Egy adatátviteli probléma miatt az adatok fel- és/vagy letöltése "
"meghiúsult a<br>''{0}''<br> helyről.<br>Részletek (nem fordított): {1}</html>"
msgid ""
@@ -15678,7 +15709,7 @@ msgstr ""
"Jelenleg {1,number,#}MB memória van a JOSM számára kiszotva"
msgid "{0}... [please type its number]"
-msgstr "{0}... [kérlek, gépeld be a számát]"
+msgstr "{0}… [kérlek, gépeld be a számát]"
msgid ""
"Failed to open URL. There is currently no platform set. Please set a "
@@ -16046,19 +16077,19 @@ msgstr "kisváros"
msgctxt "landuse"
msgid "forest"
-msgstr "erdő"
+msgstr "telepített erdő"
msgctxt "landuse"
msgid "meadow"
-msgstr "mező"
+msgstr "rét"
msgctxt "landuse"
msgid "farmland"
-msgstr "szántóföld"
+msgstr "mezőgazdasági terület"
msgctxt "landuse"
msgid "farmyard"
-msgstr ""
+msgstr "tanyaudvar"
msgctxt "landuse"
msgid "cemetery"
@@ -16074,19 +16105,19 @@ msgstr "zöldmezős terület"
msgctxt "landuse"
msgid "village_green"
-msgstr ""
+msgstr "faluközponti zöldterület (Anglia & Wales)"
msgctxt "landuse"
msgid "quarry"
-msgstr ""
+msgstr "kőfejtő"
msgctxt "landuse"
msgid "allotments"
-msgstr ""
+msgstr "kiskertek"
msgctxt "landuse"
msgid "vineyard"
-msgstr ""
+msgstr "szőlő"
msgctxt "natural"
msgid "scrub"
@@ -16094,23 +16125,23 @@ msgstr "bozót"
msgctxt "natural"
msgid "wood"
-msgstr "erdő"
+msgstr "természetes erdő"
msgctxt "natural"
msgid "grassland"
-msgstr "puszta"
+msgstr "füves puszta"
msgctxt "natural"
msgid "wetland"
-msgstr ""
+msgstr "vizenyős terület"
msgctxt "natural"
msgid "heath"
-msgstr ""
+msgstr "fenyér"
msgctxt "amenity"
msgid "fire_station"
-msgstr ""
+msgstr "tűzoltóság"
msgctxt "leisure"
msgid "park"
@@ -16122,7 +16153,7 @@ msgstr "földút"
msgctxt "building"
msgid "industrial"
-msgstr "ipari"
+msgstr "ipari épület"
msgctxt "Relation type"
msgid "associatedStreet"
@@ -16138,11 +16169,11 @@ msgstr "híd"
msgctxt "Relation type"
msgid "destination_sign"
-msgstr "célállomás jelzés"
+msgstr "célállomás-jelzés"
msgctxt "Relation type"
msgid "enforcement"
-msgstr "kikényszerítés"
+msgstr "forgalomellenőrzés"
msgctxt "Relation type"
msgid "multipolygon"
@@ -16166,7 +16197,7 @@ msgstr "útvonal"
msgctxt "Relation type"
msgid "route_master"
-msgstr "tömegközlekedési_hálózat"
+msgstr "tömegközlekedési útvonalhálózat"
msgctxt "Relation type"
msgid "site"
@@ -16182,7 +16213,7 @@ msgstr "alagút"
msgctxt "Relation type"
msgid "waterway"
-msgstr "vizi út"
+msgstr "vizfolyás"
msgctxt "Place type"
msgid "city"
@@ -16190,7 +16221,7 @@ msgstr "nagyváros"
msgctxt "Place type"
msgid "locality"
-msgstr "helyszín"
+msgstr "dűlő, lakatlan hely"
msgctxt "Place type"
msgid "village"
@@ -16206,7 +16237,7 @@ msgstr "választókerület"
msgctxt "Place type"
msgid "municipality"
-msgstr "önkormányzat"
+msgstr "település"
msgctxt "Place type"
msgid "island"
@@ -16222,7 +16253,7 @@ msgstr "falucska"
msgctxt "Place type"
msgid "suburb"
-msgstr "külváros"
+msgstr "jelentős városrész"
msgid "All Files"
msgstr "Minden fájl"
@@ -16246,7 +16277,7 @@ msgid "Enter file name:"
msgstr "Fájl név megadása:"
msgid "Enter path or folder name:"
-msgstr "Útvonal vagy mappa megadása:"
+msgstr "Elérési útvonal vagy mappa megadása:"
msgid "Error "
msgstr "Hiba "
@@ -16255,10 +16286,10 @@ msgid "Error renaming file \"{0}\" to \"{1}\""
msgstr "Fájl átnevezés hiba \"{0}\"-ról \"{1}\"-re"
msgid "File name:"
-msgstr "Fájl név:"
+msgstr "Fájlnév:"
msgid "File Name:"
-msgstr "Fájl név:"
+msgstr "Fájlnév:"
msgid "FileChooser help."
msgstr "Fájl választó súgója."
@@ -16273,7 +16304,7 @@ msgid "Files of Type:"
msgstr "Típusfájlok:"
msgid "Filter:"
-msgstr "Szűrő"
+msgstr "Szűrő:"
msgid "Folders"
msgstr "Mappák"
@@ -16294,16 +16325,16 @@ msgid "New Folder"
msgstr "Új mappa"
msgid "Open selected file"
-msgstr "Kiválasztott fájl megnyitása"
+msgstr "Kijelölt fájl megnyitása"
msgid "Open selected file."
-msgstr "Kiválasztott fájl megnyitása."
+msgstr "Kijelölt fájl megnyitása."
msgid "Rename File"
msgstr "Fájl átnevezés"
msgid "Rename file \"{0}\" to"
-msgstr "Fájl átnevezés \"{0}\"-ról"
+msgstr "\"{0}\" fájl átnevezése a következőre:"
msgid "Save in:"
msgstr "Mentés ide:"
@@ -16366,11 +16397,23 @@ msgid "Mapbox Satellite"
msgstr "Mapbox műholdkép"
msgid "DigitalGlobe Premium Imagery"
+msgstr "DigitalGlobe Premium Imagery"
+
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
msgstr ""
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -16396,10 +16439,10 @@ msgid "OpenStreetMap (German Style)"
msgstr "OpenStreetMap (Német stílusú)"
msgid "OpenStreetMap GPS Traces"
-msgstr "OpenStreetMap GPS Nyomvonalak"
+msgstr "OpenStreetMap GPS-nyomvonalak"
msgid "Public GPS traces uploaded to OpenStreetMap."
-msgstr ""
+msgstr "Az OpenStreetMapre feltöltött nyilvános GPS-nyomvonalak"
msgid "Public Transport (ÖPNV)"
msgstr "Tömegközlekedés (ÖPNV)"
@@ -16486,6 +16529,8 @@ msgid ""
"Late summer imagery where usual sources are severely limited by clouds and "
"snow (true color)"
msgstr ""
+"Nyár végi felvételek, amelyeket a rendes forrásokat erősen eltakarhatják a "
+"felhők és a hó (valós színű)"
msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr "imagico.de OSM képek térképezéshez: Dél-Transzantarktiszi-hegység"
@@ -16509,12 +16554,131 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
+"Az antarktiszi Enderby-földről és Kemp-partról a Sentinel-2 műhold által "
+"készített képek (valós színek)"
+
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
-msgid "IGN Argentina (TMS)"
-msgstr "IGN Argentina (TMS)"
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
-msgid "IGN Argentina (WMS)"
-msgstr "IGN Argentína (WMS)"
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
+msgstr ""
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI fekete-fehér 2.5m"
@@ -16930,11 +17094,11 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
-msgstr "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
+msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
-msgstr "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
+msgstr ""
msgid "SDFE Skærmkort"
msgstr ""
@@ -17372,6 +17536,18 @@ msgstr "OSMIE Dail Election Areas"
msgid "OSMIE T.ie Land not in Counties"
msgstr "OSMIE T.ie Land not in Counties"
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
@@ -17482,7 +17658,7 @@ msgid "imagico.de OSM images for mapping: Svalbard mosaic"
msgstr ""
msgid "Sentinel-2 mosaic of Svalbard (true color)"
-msgstr ""
+msgstr "Sentinel-2 mozaikfelvétel Svalbardról (Spitzbergák), valós színek"
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr "imagico.de OSM képek térképezéshez: Nyugat-Karakorum"
@@ -17682,6 +17858,8 @@ msgstr ""
msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
msgstr ""
+"A Pecsora-tenger partjáról a Sentinel-2 műhold által 2016 őszén készített "
+"kép (valós színek)"
msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
msgstr "imagico.de OSM képek térképezéshez: Usakov-sziget 2016 augusztus"
@@ -18745,8 +18923,8 @@ msgid ""
"Automatically assigns the address to a selected object in Austria. Data © "
"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
-"Automatikusan hozzárendeli a címet a kiválasztott objektumhoz Ausztriában. "
-"Data © Österreichisches Adressregister 2017, N 23806/2017."
+"Automatikusan hozzárendeli a címet a kijelölt objektumhoz Ausztriában. Data "
+"© Österreichisches Adressregister 2017, N 23806/2017."
msgid ""
"Allows the user to correct angle of buildings to 90 degrees, and aligns all "
@@ -18785,8 +18963,8 @@ msgid ""
"Imports proprietary CSV files of the Columbus/Visiontac V-900 GPS logger "
"into a GPX layer."
msgstr ""
-"A Columbus/Visiontac V-900 GPS nyomkövető saját CVS fájljait importálja egy "
-"GPX rétegre."
+"A Columbus/Visiontac V-900 GPS-naplózó saját CVS fájljait importálja egy GPX "
+"rétegre."
msgid ""
"Implements a command line and enables to create your commands. See link for "
@@ -18826,7 +19004,7 @@ msgid ""
"This plugin directly upload GPS Traces from current active layer in JOSM to "
"openstreetmap.org."
msgstr ""
-"Ez a bővítmény feltölti a GPS nyomvonalaid a JOSM aktuális aktív rétegéről "
+"Ez a bővítmény feltölti a GPS-nyomvonalaid a JOSM aktuális aktív rétegéről "
"közvetlenül az openstreetmap.org-ra."
msgid "Downloads OSM data along a way"
@@ -18888,17 +19066,17 @@ msgstr ""
msgid ""
"Download GPS points from Globalsat dg100 data logger directly in JOSM."
msgstr ""
-"GPS pontok letöltése a Globalsat dg100 nyomvonalrögzítőről, közvetlenül a "
+"GPS-pontok letöltése a Globalsat dg100 nyomvonalrögzítőről, közvetlenül a "
"JOSM-be."
msgid ""
"Analyse a set of GPS points to obtain its centre and direction of spread."
msgstr ""
-"Elemzi a GPS pontok egy halmazát, és meghatározza belőle a halmaz "
+"Elemzi a GPS-pontok egy halmazát, és meghatározza belőle a halmaz "
"középvonalát és a terjedelem irányát."
msgid "Allows to filter out unnecessary GPS tracks"
-msgstr "Lehetővé teszi a szükségtelen GPS nyomvonalak kiszűrését"
+msgstr "Lehetővé teszi a szükségtelen GPS-nyomvonalak kiszűrését"
msgid "Visualizes routing information as a routing graph."
msgstr "Útvonaltervezési adatokat jelenít meg útvonalgráfként."
@@ -19004,7 +19182,7 @@ msgstr "WMS képek vektorizálását segíti."
msgid ""
"Support live GPS input (moving dot) through a connection to gpsd server."
-msgstr "Élő GPS bemenet (mozgó pont) támogatás gpsd szerveren keresztül."
+msgstr "Élő GPS-bemenet (mozgó pont) támogatás gpsd szerveren keresztül."
msgid ""
"Provides the Log4j library for other JOSM plugins. Not meant to be installed "
@@ -19033,7 +19211,7 @@ msgid ""
msgstr ""
"Mérési dialógusablakot és réteget biztosít a szakaszok hosszának és szögének "
"méréséhez valamint területekhez, amelyek zárt vonalakkal (egyszerű poligon) "
-"vannak körbehatárolva, mérési útvonalat hoz létre (amely szintén lehet GPS "
+"vannak körbehatárolva, mérési útvonalat hoz létre (amely szintén lehet GPS-"
"rétegből importált is)."
msgid "Merge overlapping part of ways."
@@ -19044,7 +19222,7 @@ msgstr "Balra kanyarodási korlátozást ad hozzá 4 vagy 5 út halmazához."
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
-"Lehetővé teszi bármely kiválasztott terület összes objektumának címkézését, "
+"Lehetővé teszi bármely kijelölt terület összes objektumának címkézését, "
"egyszerre."
msgid "NanoLog adjustment and browsing layer"
@@ -19109,7 +19287,7 @@ msgid ""
"Write gps position info to the image file header. Run this feature from the "
"right click menu of the image layer."
msgstr ""
-"Beleírja a kép fejlécébe a GPS pozíciót. Ezt a funkciót a kép réteg jobb "
+"Beleírja a kép fejlécébe a GPS-pozíciót. Ezt a funkciót a kép réteg jobb "
"klikk menüjéből lehet futtatni."
msgid "Make photos movable and position them on the map."
@@ -19190,9 +19368,8 @@ msgid ""
"Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
"defined in routes.xml file in plugin directory"
msgstr ""
-"Útvonalakat rajzol (busz, túraútvonal, kerékpárutak, ...). Az útvonal "
-"típusoknak a bővítmény könyvtárban található routes.xml-ben kell definiálva "
-"lenniük."
+"Útvonalakat rajzol (busz, túraútvonal, kerékpárutak…). Az útvonal típusoknak "
+"a bővítmény könyvtárban található routes.xml-ben kell definiálva lenniük"
msgid "Provides routing capabilities."
msgstr "Útvonaltervezési képességet nyújt"
@@ -19234,14 +19411,14 @@ msgstr ""
msgid "Allow adding markers/nodes on current gps positions."
msgstr ""
-"Lehetővé teszi jelölők/pontok hozzáadását az aktuális GPS pozícióhoz."
+"Lehetővé teszi jelölők/pontok hozzáadását az aktuális GPS-pozícióhoz."
msgid ""
"Launch browser to a Web resource about a selected object having known tags, "
"such as Wikipedia"
msgstr ""
-"A kiválasztott objektummal kapcsolatos webes erőforrást hív be a böngészőbe "
-"az ismert címkék alapján, mint például a Wikipédia"
+"A kijelölt objektummal kapcsolatos webes erőforrást hív be a böngészőbe az "
+"ismert címkék alapján, mint például a Wikipédia"
msgid "Provides a dialog for editing tags in a tabular grid."
msgstr "Dialógusablakot nyújt a címkék táblázatban való szerkesztéséhez."
@@ -19326,7 +19503,7 @@ msgid ""
"objects."
msgstr ""
"(Ez a bővítmény jelenleg még fejlesztés alatt áll!!!) Összekapcsol és "
-"szinkronizál egy georeferált videót egy GPS nyomvonallal, így használható "
+"szinkronizál egy georeferált videót egy GPS-nyomvonallal, így használható "
"objektumok vizuális azonosításához."
msgid ""
@@ -19342,7 +19519,7 @@ msgstr ""
"Egyszerű letöltés egy hosszú, egymáshoz csatlakozó vonalsorozat mentén"
msgid "Enables searching for waypoint imported from gpx file."
-msgstr "Lehetővé teszi GPX fájlból betöltött útpontok keresését."
+msgstr "Lehetővé teszi GPX-fájlból betöltött útpontok keresését."
msgid ""
"Simplifies linking OSM objects to Wikipedia articles and Wikidata items"
@@ -19373,10 +19550,10 @@ msgid "concrete"
msgstr "beton"
msgid "concrete:plates"
-msgstr "betontáblás útburkolat"
+msgstr "betonlapok"
msgid "concrete:lanes"
-msgstr "betonozott sávok"
+msgstr "betosávok"
msgid "paving_stones"
msgstr "térkő (viacolor)"
@@ -19385,7 +19562,7 @@ msgid "sett"
msgstr "kockakő (macskakő)"
msgid "cobblestone"
-msgstr "kőburkolat (durva kavics)"
+msgstr "nagy kavics"
msgid "grass_paver"
msgstr "gyephézagos térkő"
@@ -19397,7 +19574,7 @@ msgid "fine_gravel"
msgstr "kőzúzalék (murva)"
msgid "gravel"
-msgstr "zúzottkő (nagyszemcsés)"
+msgstr "zúzott kő (nagyszemcsés)"
msgid "pebblestone"
msgstr "kavics (lekerekített)"
@@ -19427,43 +19604,43 @@ msgid "excellent"
msgstr "kiváló"
msgid "Thin Rollers: rollerblade, skateboard"
-msgstr "Vékony kerekű roller, görkorcsolya"
+msgstr "Nagyon vékony kerék: görkorcsolya, gördeszka"
msgid "good"
msgstr "jó"
msgid "Thin Wheels: racing bike"
-msgstr "Vékony kerekű országúti kerékpár"
+msgstr "Vékony kerék: versenykerékpár"
msgid "intermediate"
msgstr "közepes"
msgid "Wheels: city bike, wheelchair, scooter"
-msgstr "Normál városi kerékpár, kerekesszék"
+msgstr "Kerék: városi kerékpár, kerekesszék, robogó"
msgid "bad"
msgstr "rossz"
msgid "Robust Wheels: trekking bike, car, rickshaw"
-msgstr "Robusztus kerekű trekking kerékár, autó, riksa"
+msgstr "Robusztus kerék: túrakerékár, személyautó, riksa"
msgid "very_bad"
msgstr "nagyon rossz"
msgid "High Clearance: light duty off-road vehicle"
-msgstr "Nagy hasmagasságú könnyű terepjáró"
+msgstr "Nagy alvázmagasságú könnyű terepjáró"
msgid "horrible"
msgstr "szörnyű"
msgid "Off-Road: heavy duty off-road vehicle"
-msgstr "Terepgumis nehéz terepjáró"
+msgstr "Terep: nehéz terepjáró"
msgid "very_horrible"
msgstr "nagyon szörnyű"
msgid "Specialized off-road: tractor, ATV"
-msgstr "Speciális traktor, quad, mountain bike"
+msgstr "Speciális terep: traktor, mountain bike"
msgid "impassable"
msgstr "járhatatlan"
@@ -19477,11 +19654,11 @@ msgstr "lovaglás"
msgctxt "riding"
msgid "pitch"
-msgstr "sportpálya"
+msgstr "lovaspálya"
msgctxt "riding"
msgid "sports_centre"
-msgstr "sportközpont"
+msgstr "lovasközpont"
msgctxt "riding"
msgid "stadium"
@@ -19556,22 +19733,22 @@ msgstr "Járda"
msgctxt "sidewalk"
msgid "both"
-msgstr "bal és jobb"
+msgstr "mindkét oldalon"
msgctxt "sidewalk"
msgid "left"
-msgstr "bal"
+msgstr "bal oldalon"
msgctxt "sidewalk"
msgid "right"
-msgstr "jobb"
+msgstr "jobb oldalon"
msgctxt "sidewalk"
msgid "no"
msgstr "nincs"
msgid "Service type"
-msgstr "Szolgáltatás típus"
+msgstr "Szolgáltatás típusa"
msgid "yard"
msgstr "rakodó"
@@ -19586,7 +19763,7 @@ msgid "crossover"
msgstr "vágányelágazás"
msgid "Electrified"
-msgstr "Villamosítás"
+msgstr "Villamosított"
msgctxt "electrified"
msgid "contact_line"
@@ -19605,16 +19782,16 @@ msgid "rail"
msgstr "sín"
msgid "Voltage in Volts (V)"
-msgstr "Feszültség Volt-ban (V)"
+msgstr "Feszültség Voltban (V)"
msgid "Frequency in Hertz (Hz)"
-msgstr "Frekvencia Hertz-ben (Hz)"
+msgstr "Frekvencia Hertzben (Hz)"
msgid "16.67"
msgstr "16.67"
msgid "16.7"
-msgstr "16,7"
+msgstr "16.7"
msgctxt "railway"
msgid "Tracks"
@@ -19642,13 +19819,13 @@ msgid "Operator"
msgstr "Üzemeltető"
msgid "Service Times"
-msgstr "Szolgáltatás ideje"
+msgstr "Istentiszteletek ideje"
msgid "Opening Hours"
msgstr "Nyitva tartás"
msgid "Wheelchairs"
-msgstr "Kerekesszék"
+msgstr "Akadálymentesség"
msgid "yes"
msgstr "igen"
@@ -19720,10 +19897,10 @@ msgid "sushi"
msgstr "szusi"
msgid "steak_house"
-msgstr "steak-ház"
+msgstr "steakház"
msgid "fish_and_chips"
-msgstr "fish and chips"
+msgstr "fish & chips"
msgid "chicken"
msgstr "csirke"
@@ -19738,7 +19915,7 @@ msgid "international"
msgstr "nemzetközi"
msgid "seafood"
-msgstr "tenger gyümölcsei"
+msgstr "tengeri"
msgid "spanish"
msgstr "spanyol"
@@ -19762,7 +19939,7 @@ msgid "korean"
msgstr "koreai"
msgid "Internet access"
-msgstr "Internetelérés"
+msgstr "Internetcsatlakozás"
msgid "wlan"
msgstr "wifi"
@@ -19774,7 +19951,7 @@ msgid "terminal"
msgstr "terminál"
msgid "Internet access fee"
-msgstr "Internetelérés fizetős"
+msgstr "Internetcsatlakozás díja"
msgid "Smoking"
msgstr "Dohányzás"
@@ -19946,11 +20123,11 @@ msgstr "távirányítós autó"
msgctxt "sport"
msgid "rugby_league"
-msgstr "ligarögbi"
+msgstr "rögbi (league)"
msgctxt "sport"
msgid "rugby_union"
-msgstr "(unió) rögbi"
+msgstr "rögbi (union)"
msgctxt "sport"
msgid "running"
@@ -20005,7 +20182,7 @@ msgid "10pin"
msgstr "bowling"
msgid "Fee"
-msgstr "Fizetős"
+msgstr "Díj"
msgid "06:00-20:00"
msgstr "06:00-20:00"
@@ -20022,7 +20199,7 @@ msgstr "többszintes"
msgctxt "parking"
msgid "surface"
-msgstr "felszín"
+msgstr "felszíni"
msgctxt "parking"
msgid "underground"
@@ -20030,7 +20207,7 @@ msgstr "mélygarázs"
msgctxt "parking"
msgid "rooftop"
-msgstr "háztető"
+msgstr "épület tetején"
msgid "Reference number"
msgstr "Azonosítószám"
@@ -20039,22 +20216,22 @@ msgid "Access"
msgstr "Hozzáférés"
msgid "private"
-msgstr "privát"
+msgstr "magántulajdon"
msgid "customers"
-msgstr "vásárlók részére"
+msgstr "ügyfeleknek"
msgid "permissive"
-msgstr "engedélyköteles"
+msgstr "engedéllyel"
msgid "Time Limit (minutes)"
msgstr "Időkorlát (perc)"
msgid "Supervised"
-msgstr "Őrzött/felügyelt"
+msgstr "Felügyelt"
msgid "General Access"
-msgstr "Általános behajtás"
+msgstr "Általánosan használható"
msgid "destination"
msgstr "célforgalom"
@@ -20135,8 +20312,8 @@ msgid ""
"Plants that lose their foliage for a very short period, when old leaves fall "
"off and new foliage growth is starting."
msgstr ""
-"Olyan növények, amik a lombjukat csak nagyon rövid időre vesztik el, amikor "
-"a régi levelek lehullanak és az új levélzet elkezd nőni."
+"Olyan növények, amelyek a lombjukat csak nagyon rövid időre vesztik el, "
+"amikor a régi levelek lehullanak és az új levélzet elkezd nőni."
msgid "semi_evergreen"
msgstr "félig örökzöld"
@@ -20221,13 +20398,13 @@ msgid "mormon"
msgstr "mormon"
msgid "old_catholic"
-msgstr ""
+msgstr "ókatolikus"
msgid "orthodox"
msgstr "ortodox"
msgid "pentecostal"
-msgstr "pünkösdi"
+msgstr "pünkösdista"
msgid "presbyterian"
msgstr "presbiteriánus"
@@ -20236,7 +20413,7 @@ msgid "protestant"
msgstr "protestáns"
msgid "quaker"
-msgstr "kvékersita"
+msgstr "kvéker"
msgid "roman_catholic"
msgstr "római katolikus"
@@ -20254,10 +20431,10 @@ msgid "110000;20000"
msgstr "110000;20000"
msgid "Branch operator"
-msgstr "Üzemeltető"
+msgstr "Telephely-üzemeltető"
msgid "Amount of Cables"
-msgstr "Kábelek száma"
+msgstr "Kábelek mennyisége"
msgid "Amount of circuits"
msgstr "Körök mennyisége"
@@ -20279,11 +20456,11 @@ msgstr "földalatti"
msgctxt "power"
msgid "platform"
-msgstr "emelvény"
+msgstr "tengeri platformon"
msgctxt "power"
msgid "kiosk"
-msgstr "pavilon"
+msgstr "kis épület"
msgid "Start date"
msgstr "Kezdő dátum"
@@ -20307,7 +20484,7 @@ msgid "7 GW"
msgstr "7 GW"
msgid "electricity"
-msgstr "elektromos áram"
+msgstr "villamos energia"
msgid "hot water"
msgstr "forró víz"
@@ -20337,13 +20514,13 @@ msgid "Toll"
msgstr "Fizetős"
msgid "Intermittent"
-msgstr "Időszakos"
+msgstr "Időszakos meder"
msgid "Seasonal"
-msgstr "Évszakfüggő"
+msgstr "Időszakos"
msgid "In the tidal range"
-msgstr "Árapály zónában van"
+msgstr "Árapályzónában van"
msgid "culvert"
msgstr "áteresz"
@@ -20367,41 +20544,41 @@ msgid "Canoe"
msgstr "Kenu"
msgid "Substance"
-msgstr "Anyag"
+msgstr "Szállított anyag"
msgid "water"
msgstr "víz"
msgid "gas"
-msgstr "gáz"
+msgstr "földgáz"
msgid "heat"
msgstr "hő"
msgid "oil"
-msgstr "olaj"
+msgstr "kőolaj"
msgid "sewage"
msgstr "szennyvíz"
msgid "Support"
-msgstr "Tartója"
+msgstr "Alátámasztás"
msgctxt "mounting/support"
msgid "pole"
-msgstr "oszlop"
+msgstr "rúd"
msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr "falra_szerelt"
+msgstr "falra szerelt"
msgctxt "mounting/support"
msgid "billboard"
-msgstr "hirdetőtáblán"
+msgstr "óriásplakát"
msgctxt "mounting/support"
msgid "ground"
-msgstr "földön_álló"
+msgstr "talaj"
msgid "IATA"
msgstr "IATA"
@@ -20410,10 +20587,10 @@ msgid "ICAO"
msgstr "ICAO"
msgid "Car brand"
-msgstr "Autó márka"
+msgstr "Autómárka"
msgid "Motorcycle brand"
-msgstr "Motorkerékpár márka"
+msgstr "Motorkerékpár-márka"
msgid "From (initial stop)"
msgstr "Honnan (első megálló)"
@@ -20428,7 +20605,7 @@ msgid "Network"
msgstr "Hálózat"
msgid "Color (HTML name or hexadecimal code)"
-msgstr "Szín (HTML név vagy hexadecimális kód)"
+msgstr "Szín (HTML-név vagy hexadecimális kód)"
msgctxt "color"
msgid "black"
@@ -20463,7 +20640,7 @@ msgid "#CD853F"
msgstr "#CD853F"
msgid "Streets"
-msgstr "Autóutak"
+msgstr "Utcák"
msgid "Motorway"
msgstr "Autópálya"
@@ -20472,7 +20649,7 @@ msgid "Destination"
msgstr "Célpont"
msgid "Destination reference"
-msgstr "Célpont azonosító"
+msgstr "Célpont-azonosító"
msgid "Placement"
msgstr "Vonal elhelyezkedése"
@@ -20514,7 +20691,7 @@ msgid "Trunk"
msgstr "Autóút"
msgid "Motorroad"
-msgstr "Autópálya"
+msgstr "Autóút"
msgid "Trunk Link"
msgstr "Autóút-felhajtó"
@@ -20523,22 +20700,22 @@ msgid "Primary"
msgstr "Főút"
msgid "Overhead trolley wires"
-msgstr "Trolibusz felsõvezeték"
+msgstr "Trolibusz-felsővezeték"
msgid "Primary Link"
-msgstr "Főút lehajtó"
+msgstr "Főút-felhajtó"
msgid "Secondary"
msgstr "Összekötő út"
msgid "Secondary Link"
-msgstr "Összekötő út lehajtó"
+msgstr "Összekötőút-felhajtó"
msgid "Tertiary"
msgstr "Bekötőút"
msgid "Tertiary Link"
-msgstr "Bekötőút lehajtó"
+msgstr "Bekötőút-felhajtó"
msgid "Unclassified"
msgstr "Egyéb közút"
@@ -20547,16 +20724,16 @@ msgid "Street has no name"
msgstr "Névtelen utca"
msgid "Passing Places"
-msgstr "Félreálló hely"
+msgstr "Kitérőhely"
msgid "Residential"
-msgstr "Lakóút, utca"
+msgstr "Lakott területi utca"
msgid "Bicycle Road"
msgstr "Kerékpárút"
msgid "Highway type"
-msgstr "Közút típusa"
+msgstr "Úttípus"
msgctxt "Highway"
msgid "residential"
@@ -20572,14 +20749,14 @@ msgstr "osztályozatlan"
msgctxt "Highway"
msgid "path"
-msgstr "sáv"
+msgstr "ösvény"
msgctxt "Highway"
msgid "cycleway"
msgstr "kerékpárút"
msgid "Vehicle access"
-msgstr "Jármű hozzáférés"
+msgstr "Behajtás járművel"
msgid "Oneway for bicycle"
msgstr "Kerékpárnak egyirányú"
@@ -20597,10 +20774,10 @@ msgid "Service"
msgstr "Szervizút"
msgid "Service way type"
-msgstr "Szervíz út típus"
+msgstr "Szervízút típusa"
msgid "alley"
-msgstr "sikátor"
+msgstr "hátsó „szolgalmi” út"
msgid "driveway"
msgstr "kocsifelhajtó"
@@ -20612,13 +20789,13 @@ msgid "drive-through"
msgstr "áthajtó"
msgid "emergency_access"
-msgstr "tűzoltási_felvonulási_terület"
+msgstr "tűzoltási felvonulási út"
msgid "Parking Aisle"
msgstr "Parkolóút"
msgid "Escape"
-msgstr "Fékezősáv (\"majomfogó\")"
+msgstr "Fékezősáv („majomfogó”)"
msgid ""
"Emergency lane beside long descending slopes for trucks and other vehicles "
@@ -20642,7 +20819,7 @@ msgstr "autópálya"
msgctxt "Highway"
msgid "motorway_link"
-msgstr "autópálya-felhajtó"
+msgstr "autópályafelhajtó"
msgctxt "Highway"
msgid "trunk"
@@ -20650,7 +20827,7 @@ msgstr "autóút"
msgctxt "Highway"
msgid "trunk_link"
-msgstr "autóút-felhajtó"
+msgstr "autóútfelhajtó"
msgctxt "Highway"
msgid "primary"
@@ -20658,7 +20835,7 @@ msgstr "főút"
msgctxt "Highway"
msgid "primary_link"
-msgstr "főútlehajtó"
+msgstr "főútfelhajtó"
msgctxt "Highway"
msgid "secondary"
@@ -20666,7 +20843,7 @@ msgstr "összekötőút"
msgctxt "Highway"
msgid "secondary_link"
-msgstr "összekötőút lehajtó"
+msgstr "összekötőútfelhajtó"
msgctxt "Highway"
msgid "tertiary"
@@ -20674,7 +20851,7 @@ msgstr "bekötőút"
msgctxt "Highway"
msgid "tertiary_link"
-msgstr "bekötőút lehajtó"
+msgstr "bekötőútfelhajtó"
msgctxt "Highway"
msgid "bus_guideway"
@@ -20686,7 +20863,7 @@ msgstr "lovaglóút"
msgctxt "Highway"
msgid "living_street"
-msgstr "Lakó-pihenő övezet"
+msgstr "lakó-pihenő övezet"
msgctxt "Highway"
msgid "pedestrian"
@@ -20698,14 +20875,14 @@ msgstr "földút"
msgctxt "Highway"
msgid "footway"
-msgstr "járda"
+msgstr "gyalogút"
msgctxt "Highway"
msgid "steps"
msgstr "lépcső"
msgid "Junction"
-msgstr "Útelágazás"
+msgstr "Csomópont"
msgid "roundabout"
msgstr "körforgalom"
@@ -20739,16 +20916,16 @@ msgid "All vehicles"
msgstr "Minden jármű"
msgid "use_sidepath"
-msgstr "Oldalsáv használat"
+msgstr "Oldalsáv használata"
msgid "Motor vehicles"
msgstr "Gépjárművek"
msgid "Light Commercial Vehicles (goods)"
-msgstr "Kisteherautó (3,5t-ig)"
+msgstr "Kisteherautó (3,5 t-ig)"
msgid "Heavy Goods Vehicles (hgv)"
-msgstr "Tehergépjármű (3,5t feletti)"
+msgstr "Tehergépjármű (3,5 t felett)"
msgid "Vehicles per use"
msgstr "Járművek felhasználás szerint"
@@ -20766,7 +20943,7 @@ msgid "Public Service Vehicles (psv)"
msgstr "Közösségi közlekedés"
msgid "Tourist buses"
-msgstr "Túrista buszok"
+msgstr "Turistabuszok"
msgid "Max. speed Heavy Goods Vehicles (km/h)"
msgstr "Sebeeségkorlátozás tehergépkocsinak (km/h)"
@@ -20789,7 +20966,7 @@ msgstr "igen"
msgctxt "overtaking"
msgid "both"
-msgstr "bal és jobb"
+msgstr "mindkét oldalról"
msgctxt "overtaking"
msgid "forward"
@@ -20814,7 +20991,7 @@ msgid "Ford"
msgstr "Gázló"
msgid "stepping_stones"
-msgstr "lépőkő"
+msgstr "lépőkövek"
msgid "Ways"
msgstr "Egyéb utak"
@@ -20829,7 +21006,7 @@ msgid "grade1"
msgstr "1. osztály"
msgid "Solid: paved or heavily compacted hardcore surface"
-msgstr "Szilárd: burkolt, vagy erősen tömörített, kemény felült"
+msgstr "Szilárd: burkolt, vagy erősen tömörített, kemény felületű"
msgid "grade2"
msgstr "2. osztály"
@@ -20950,7 +21127,7 @@ msgstr "szörnyű"
msgctxt "trail_visibility"
msgid "no"
-msgstr "nem"
+msgstr "nem látható"
msgid "Ski"
msgstr "Sí"
@@ -20962,38 +21139,38 @@ msgid "Dedicated Bridleway"
msgstr "Kijelölt lovaglóút"
msgid "Cycle Lane/Track"
-msgstr "Kerékpár sáv/Nyomvonal"
+msgstr "Kerékpársáv / kerékpáros nyom"
msgid "Cycleway"
msgstr "Kerékpárút"
msgctxt "cycleway"
msgid "lane"
-msgstr ""
+msgstr "sáv"
msgctxt "cycleway"
msgid "track"
-msgstr ""
+msgstr "nyom"
msgctxt "cycleway"
msgid "opposite_lane"
-msgstr ""
+msgstr "ellentétes sáv"
msgctxt "cycleway"
msgid "opposite_track"
-msgstr ""
+msgstr "ellentétes nyom"
msgctxt "cycleway"
msgid "opposite"
-msgstr ""
+msgstr "ellentétes"
msgctxt "cycleway"
msgid "share_busway"
-msgstr ""
+msgstr "buszsávval közös"
msgctxt "cycleway"
msgid "shared_lane"
-msgstr ""
+msgstr "közös sáv"
msgid "Cycleway left"
msgstr "Kerékpárút bal oldalon"
@@ -21002,13 +21179,13 @@ msgid "Cycleway right"
msgstr "Kerékpárút jobb oldalon"
msgid "Oneway (bicycle)"
-msgstr "Egyirányú (kerékpár számára)"
+msgstr "Egyirányú (kerékpárnak)"
msgid "Edit Highway Attributes:"
-msgstr "Közút jellemzők szerkesztése:"
+msgstr "Úttulajdonságok szerkesztése:"
msgid "Highway"
-msgstr "Közút"
+msgstr "Út"
msgid "Dedicated Cycleway"
msgstr "Kijelölt kerékpárút"
@@ -21043,19 +21220,19 @@ msgid "Ramp"
msgstr "Rámpa"
msgid "Stroller ramp"
-msgstr "Babakocsi rámpa"
+msgstr "Babakocsirámpa"
msgid "Bicycle ramp"
-msgstr "Kerékpár rámpa"
+msgstr "Kerékpárrámpa"
msgid "Wheelchair ramp"
-msgstr "Kerekesszék rámpa"
+msgstr "Kerekesszékrámpa"
msgid "Luggage ramp"
-msgstr "Bőrönd rámpa"
+msgstr "Bőröndrámpa"
msgid "automatic"
-msgstr "automata"
+msgstr "automatikus"
msgid "manual"
msgstr "kézi"
@@ -21067,7 +21244,7 @@ msgid "Left handrail"
msgstr "Bal oldali korlát"
msgid "Center handrail"
-msgstr "Közép korlát"
+msgstr "Középső korlát"
msgid "Right handrail"
msgstr "Jobb oldali korlát"
@@ -21109,10 +21286,10 @@ msgid "Traffic Signal"
msgstr "Jelzőlámpa"
msgid "Optional crossing attributes:"
-msgstr "Opcionális gyalogos átkelő jellemzők:"
+msgstr "Opcionális gyalogosátkelő jellemzői:"
msgid "Pedestrian crossing type"
-msgstr "Gyalogátkelő típusa"
+msgstr "Gyalogosátkelő típusa"
msgid "uncontrolled"
msgstr "ellenőrizetlen"
@@ -21136,7 +21313,7 @@ msgid "pelican"
msgstr "pelikán"
msgid "toucan"
-msgstr "tukánmadár"
+msgstr "tukán"
msgid "puffin"
msgstr "lunda"
@@ -21175,10 +21352,10 @@ msgid "Mini-Roundabout"
msgstr "Mini-körforgalom"
msgid "clockwise"
-msgstr "óramutatóval megegyező"
+msgstr "óramutató járásával megegyező"
msgid "Pedestrian Crossing"
-msgstr "Gyalogátkelő"
+msgstr "Gyalogosátkelő"
msgid "Tactile Paving"
msgstr "Vakvezető burkolat"
@@ -21187,7 +21364,7 @@ msgid "incorrect"
msgstr "helytelen"
msgid "In case of traffic signals:"
-msgstr "Közlekedési jelzések esetében"
+msgstr "Közlekedési jelzések esetében:"
msgid "Traffic Calming"
msgstr "Forgalomcsillapító"
@@ -21196,7 +21373,7 @@ msgid "Bump"
msgstr "Fekvőrendőr"
msgid "Chicane"
-msgstr "Sávelhúzás (Sikán)"
+msgstr "Sávelhúzás (sikán)"
msgid "Choker"
msgstr "Sávszűkítés"
@@ -21221,16 +21398,16 @@ msgid "Passing Place"
msgstr "Kitérő (útkiszélesedés)"
msgid "Turning Circle"
-msgstr "Fordulóhely"
+msgstr "Megfordulókör"
msgid "Turning Loop"
-msgstr "Forduló hurok"
+msgstr "Megfordulóhurok"
msgid "City Limit Sign"
-msgstr "Településhatár tábla"
+msgstr "Lakott terület határa tábla"
msgid "Second Name"
-msgstr "Alternatív név"
+msgstr "Második név"
msgid "Speed Limit Sign"
msgstr "Sebességkorlátozás tábla"
@@ -21245,7 +21422,7 @@ msgid "Highway milestone"
msgstr "Kilométerkő"
msgid "Distance (kilometers)"
-msgstr "Távolság (kilométerben)"
+msgstr "Távolság (km)"
msgctxt "junction=yes"
msgid "Named Junction"
@@ -21262,7 +21439,7 @@ msgid "Elevator"
msgstr "Felvonó"
msgid "Grit Bin"
-msgstr "Útszóróanyag láda"
+msgstr "Útszóróanyagos láda"
msgid "Mountain Pass"
msgstr "Hegyi hágó"
@@ -21283,10 +21460,10 @@ msgid "stone"
msgstr "kő"
msgid "Bollard"
-msgstr "Oszlop"
+msgstr "Terelőoszlop"
msgid "Bollard type"
-msgstr "Oszlop típus"
+msgstr "Terelőoszlop típusa"
msgid "rising"
msgstr "kiemelkedő"
@@ -21298,7 +21475,7 @@ msgid "plastic"
msgstr "műanyag"
msgid "Cycle Barrier"
-msgstr "Kerékpárakadály (labirint korlát)"
+msgstr "Kerékpárakadály (labirintkorlát)"
msgid "Cattle Grid"
msgstr "Marharács"
@@ -21325,7 +21502,7 @@ msgid "barbed_wire"
msgstr "szögesdrót"
msgid "chain_link"
-msgstr "drótháló"
+msgstr "drótkerítés"
msgid "electric"
msgstr "elektromos"
@@ -21358,17 +21535,17 @@ msgid "Retaining Wall"
msgstr "Támfal"
msgid "Jersey Barrier"
-msgstr "Jersey terelőfal (T fal)"
+msgstr "Előregyártott terelőfal (T fal)"
msgctxt "Barrier"
msgid "Ditch"
-msgstr "Vizesárok"
+msgstr "Árok"
msgid "Kerb"
msgstr "Járdaszegély"
msgid "Tactile paving"
-msgstr "Taktilis burkolat"
+msgstr "Vakvezető burkolat"
msgid "Entrance (Barrier Opening)"
msgstr "Sorompós bejárat"
@@ -21397,22 +21574,22 @@ msgid "Bump Gate"
msgstr "Lökőkapu"
msgid "Kissing Gate"
-msgstr "U vagy V \"zsilip\" kapu (Kissing gate)"
+msgstr "U vagy V „zsilipkapu” (kissing gate)"
msgid "Chain"
msgstr "Lánc"
msgid "Stile"
-msgstr "Kerítés átkelési lehetőség"
+msgstr "Kerítésátjáró"
msgid "ladder"
msgstr "létra"
msgid "squeezer"
-msgstr "szűk rés"
+msgstr "rés"
msgid "stepover"
-msgstr "átlépő"
+msgstr "átlépőhely"
msgid "Turnstile"
msgstr "Forgókapu"
@@ -21421,10 +21598,10 @@ msgid "Sally Port"
msgstr "Erődített kapu"
msgid "Passageways"
-msgstr "Átjárók"
+msgstr "Aluljárók"
msgid "Building Passage"
-msgstr "Épület átjáró"
+msgstr "Épület alatti átjáró"
msgid "Arcade"
msgstr "Árkádsor"
@@ -21439,7 +21616,7 @@ msgid "Colonnade"
msgstr "Oszlopsor"
msgid "Avalanche Protector"
-msgstr "Lavina-védelmi alagút"
+msgstr "Lavinavédelmi alagút"
msgctxt "main group"
msgid "Water"
@@ -21450,16 +21627,16 @@ msgid "Water"
msgstr "Vizek"
msgid "Drain"
-msgstr "Ér"
+msgstr "Vízlevezető csatorna"
msgid "Ditch"
-msgstr "Árok, csermely"
+msgstr "Árok"
msgid "Stream"
msgstr "Patak"
msgid "River"
-msgstr "Folyam"
+msgstr "Folyó"
msgid "Lock"
msgstr "Zsilip"
@@ -21485,37 +21662,37 @@ msgid "Dam"
msgstr "Duzzasztógát"
msgid "Groyne"
-msgstr "Hullámtörő"
+msgstr "Sarkantyú"
msgid "Breakwater"
-msgstr "Hullámtörő gát"
+msgstr "Hullámtörő"
msgid "Culvert"
msgstr "Áteresz"
msgid "Basin"
-msgstr "Vízgyűjtő"
+msgstr "Vésztározó"
msgid "retention"
-msgstr ""
+msgstr "vízmegtartó"
msgid "infiltration"
-msgstr ""
+msgstr "elszivárogtató"
msgid "detention"
-msgstr ""
+msgstr "lassú vízleengedő"
msgid "Reservoir"
msgstr "Víztározó"
msgid "evaporator"
-msgstr ""
+msgstr "lepárló"
msgid "tailings"
-msgstr ""
+msgstr "bányászatimelléktermék-tároló"
msgid "water_storage"
-msgstr ""
+msgstr "víztároló"
msgid "Covered Reservoir"
msgstr "Fedett víztározó"
@@ -21525,10 +21702,10 @@ msgid "Water"
msgstr "Víz"
msgid "A body of standing water, such as a lake or pond."
-msgstr "Álló víztömeg, mint egy tó vagy tavacska."
+msgstr "Álló víztest, pl. tó vagy tavacska."
msgid "Water Body"
-msgstr "Víztömeg"
+msgstr "Víztest"
msgid "canal"
msgstr "csatorna"
@@ -21561,7 +21738,7 @@ msgid "Salt Water"
msgstr "Sós víz"
msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr "A víztömeg jelenléte időszakos (szezonálisan eltűnik)?"
+msgstr "Időszakos-e a víztest (időnként eltűnik)?"
msgid "Coastline"
msgstr "Partvonal"
@@ -21569,7 +21746,7 @@ msgstr "Partvonal"
msgid ""
"Line between the sea and land (with the water on the right side of the way)."
msgstr ""
-"A tenger és a föld közötti elválasztó vonal (a vízzel a vonal jobb oldalán)."
+"A tenger és a föld közötti elválasztó vonal (a víz a vonal jobb oldalán)."
msgid "Riverbank"
msgstr "Folyópart"
@@ -21578,10 +21755,10 @@ msgid "Wetland"
msgstr "Vizenyős terület"
msgid "Waterlogged area, either permanently or seasonally with vegetation."
-msgstr "Állandóan vagy szezonálisan vizenyős terület, növényzettel."
+msgstr "Állandóan vagy időszakosan vizenyős terület, növényzettel."
msgid "swamp"
-msgstr "ingovány"
+msgstr "erdős mocsár"
msgid "bog"
msgstr "láp"
@@ -21602,19 +21779,19 @@ msgid "mangrove"
msgstr "mangrove mocsár"
msgid "wet_meadow"
-msgstr "Nedves_mező"
+msgstr "ingoványos rét"
msgid "string_bog"
-msgstr ""
+msgstr "dagadóláp"
msgid "saltern"
-msgstr "sótelep"
+msgstr "sólepárló medence"
msgid "Mud"
msgstr "Sár"
msgid "Large area covered with mud."
-msgstr "Nagy terület sárral fedve."
+msgstr "Sárral fedett nagy terület."
msgid "Beach"
msgstr "Tengerpart"
@@ -21643,7 +21820,7 @@ msgid "Ferry Terminal"
msgstr "Kompkikötő"
msgid "Cargo"
-msgstr "Szállítmány"
+msgstr "Rakomány"
msgctxt "cargo"
msgid "passengers"
@@ -21659,7 +21836,7 @@ msgstr "kerékpár"
msgctxt "cargo"
msgid "hgv"
-msgstr "tehergépjármű (3,5t feletti)"
+msgstr "tehergépjármű (>3,5 t)"
msgctxt "cargo"
msgid "passengers;vehicle"
@@ -21669,16 +21846,16 @@ msgid "Ferry Route"
msgstr "Kompútvonal"
msgid "Marina"
-msgstr "Jachtkikötő"
+msgstr "Kishajókikötő"
msgid "Dump Station"
-msgstr "Szennyvízleeresztő állomás"
+msgstr "Szaniterürítő hely"
msgid "public"
msgstr "nyilvános"
msgid "Marine Fuel"
-msgstr "Hajó töltőállomás"
+msgstr "Hajóüzemanyag-töltő állomás"
msgid "Agip"
msgstr "Agip"
@@ -21795,7 +21972,7 @@ msgid "Pier"
msgstr "Móló"
msgid "Mooring"
-msgstr "Móló"
+msgstr "Kikötőhely"
msgid "commercial"
msgstr "kereskedelmi"
@@ -21831,22 +22008,22 @@ msgid "main"
msgstr "fő"
msgid "branch"
-msgstr "elágazás"
+msgstr "mellék"
msgid "industrial"
msgstr "ipari"
msgid "military"
-msgstr "katonai terület"
+msgstr "katonai"
msgid "tourism"
-msgstr "turisztika"
+msgstr "turisztikai"
msgid "freight"
msgstr "áruszállítás"
msgid "Narrow Gauge Rail"
-msgstr "Keskeny nyomtávolságú pálya"
+msgstr "Keskeny nyomtávú vasút"
msgid "Monorail"
msgstr "Egysínű vasúti pálya"
@@ -21886,29 +22063,29 @@ msgstr "Akadály"
msgctxt "crossing:barrier"
msgid "yes"
-msgstr "igen"
+msgstr "sorompó"
msgctxt "crossing:barrier"
msgid "no"
-msgstr "nem"
+msgstr "nincs"
msgctxt "crossing:barrier"
msgid "half"
-msgstr "fél"
+msgstr "félsorompó"
msgctxt "crossing:barrier"
msgid "full"
-msgstr "teli"
+msgstr "teljes sorompó"
msgctxt "crossing:barrier"
msgid "double_half"
msgstr "dupla félsorompó"
msgid "Crossing"
-msgstr "Vasúti gyalogátkelő"
+msgstr "Vasúti átjáró"
msgid "Crossing type"
-msgstr "Átkelő típusa"
+msgstr "Vasúti átjáró típusa"
msgid "Turntable"
msgstr "Fordítókorong"
@@ -21926,43 +22103,43 @@ msgid "Railway milestone"
msgstr "Vasúti szelvénykő"
msgid "Aerialway"
-msgstr "Felvonó"
+msgstr "Drótkötélpályás felvonó"
msgid "Cable Car"
-msgstr "Nagykabinos"
+msgstr "Nagykabinos felvonó"
msgid "Number of people per hour"
msgstr "Utasok száma óránként"
msgid "Number of people per car"
-msgstr "férőhely kabinonként"
+msgstr "Férőhelyek száma kabinonként"
msgid "Typical journey time in minutes"
-msgstr "átlagos menetidő percben"
+msgstr "Átlagos menetidő percben"
msgid "Has heating?"
-msgstr "Fűtött?"
+msgstr "Fűtött-e?"
msgid "Chair Lift"
msgstr "Üléses felvonó"
msgid "Number of people per chair"
-msgstr "férőhely ülésenként"
+msgstr "Férőhelyek száma ülésenként"
msgid "Has bubble?"
-msgstr "Védőburkos?"
+msgstr "Van-e védőburka?"
msgid "Gondola"
msgstr "Gondolakabinos"
msgid "Number of people per gondola"
-msgstr "férőhely kabinonként"
+msgstr "Férőhelyek száma gondolánként"
msgid "Mixed Lift"
msgstr "Vegyes felvonó"
msgid "Number of people per gondola/chair"
-msgstr "férőhely kabinonként/ülésenként"
+msgstr "Férőhelyek száma kabinonként/ülésenként"
msgid "Drag Lift"
msgstr "Húzólift"
@@ -21970,13 +22147,15 @@ msgstr "Húzólift"
msgid ""
"drag_lift (general type - use only if exact type (see values below) is "
"unknown)"
-msgstr "Sífelvonó"
+msgstr ""
+"Sífelvonó (általános típus – csak akkor használjuk, ha a pontos érték (lásd "
+"lent) ismeretlen)"
msgid "t-bar"
msgstr "Csákányos felvonó"
msgid "j-bar"
-msgstr ""
+msgstr "Egyszemélyes csákányos felvonó"
msgid "platter"
msgstr "Tányéros felvonó"
@@ -21985,7 +22164,7 @@ msgid "rope_tow"
msgstr "Kapaszkodólift"
msgid "Magic Carpet"
-msgstr "Szállítószalag"
+msgstr "Szállítószalagos sílift"
msgid "Goods"
msgstr "Áruszállító"
@@ -22013,7 +22192,7 @@ msgid "tram"
msgstr "villamos"
msgid "metro"
-msgstr "földalatti/metró"
+msgstr "metró"
msgid "ferry"
msgstr "komp"
@@ -22022,7 +22201,7 @@ msgid "Capacity (overall)"
msgstr "Kapacitás (teljes)"
msgid "Spaces for Disabled"
-msgstr "Mozgássérült helyek"
+msgstr "Mozgássérülteknek fenntartott helyek"
msgid "Spaces for Women"
msgstr "Nőknek fenntartott helyek"
@@ -22037,13 +22216,13 @@ msgid "Parking Space"
msgstr "Parkolóhely (egy)"
msgid "Capacity"
-msgstr "Férőhely"
+msgstr "Kapacitás"
msgid "Covered (with roof)"
msgstr "Fedett (tetővel)"
msgid "Parking Entrance"
-msgstr "Parkoló bejárat"
+msgstr "Parkolóbejárat"
msgid "Fuel"
msgstr "Benzinkút"
@@ -22052,10 +22231,10 @@ msgid "With shop"
msgstr "Üzlettel"
msgid "convenience"
-msgstr "élelmiszer bolt"
+msgstr "kis élelmiszerbolt"
msgid "kiosk"
-msgstr "kioszk"
+msgstr "trafik"
msgid "Diesel (Gas To Liquid - ultimate diesel)"
msgstr "Gázolaj (szintetikus GTL)"
@@ -22070,7 +22249,7 @@ msgid "1/50 mix (mofa/moped)"
msgstr "1:50 keverék (moped)"
msgid "Fuel cards:"
-msgstr "Üzemanyag kártyák:"
+msgstr "Üzemanyagkártyák:"
msgid "DKV"
msgstr "DKV"
@@ -22100,22 +22279,22 @@ msgid "Truck"
msgstr "Teherautó"
msgid "Number of Sockets:"
-msgstr "Aljzatok száma:"
+msgstr "Konnektorok száma:"
msgid "Type 1 (Yazaki)"
-msgstr "Type 1 (Yazaki)"
+msgstr "1. típus (Yazaki)"
msgid "Type 1 Combo"
-msgstr "Type 1 Combo"
+msgstr "1. típus Combo"
msgid "Type 2 (Mennekes)"
-msgstr "Type 2 (Mennekes)"
+msgstr "2. típus (Mennekes)"
msgid "Type 2 Combo"
-msgstr "Type 2 Combo"
+msgstr "2. típus Combo"
msgid "Type 3 (SCAME)"
-msgstr "Type 3 (SCAME)"
+msgstr "3. típus (SCAME)"
msgid "CHAdeMO"
msgstr "CHAdeMO"
@@ -22142,7 +22321,7 @@ msgid "NEMA 5-20"
msgstr "NEMA 5-20"
msgid "Authentication:"
-msgstr "Felhasználóazonosítás"
+msgstr "Felhasználóazonosítás:"
msgid "Phone call"
msgstr "Telefonhívás"
@@ -22160,7 +22339,7 @@ msgid "Wash"
msgstr "Autómosó"
msgid "Self Service"
-msgstr ""
+msgstr "Önkiszolgáló"
msgid "Car Dealer"
msgstr "Autókereskedés"
@@ -22172,29 +22351,29 @@ msgid "only"
msgstr "kizárólag"
msgid "Repair"
-msgstr "Szerviz"
+msgstr "Szerelés"
msgctxt "shop=car_repair"
msgid "Service"
-msgstr ""
+msgstr "Szerviz"
msgid "dealer"
-msgstr ""
+msgstr "kereskedés"
msgid "repair"
-msgstr ""
+msgstr "szerelés"
msgid "parts"
-msgstr ""
+msgstr "alkatrész"
msgid "tyres"
-msgstr ""
+msgstr "gumi"
msgid "Parts"
-msgstr "Alkatrészek"
+msgstr "Alkatrész"
msgid "Tires"
-msgstr "Gumik"
+msgstr "Gumi"
msgid "Rental"
msgstr "Kölcsönző"
@@ -22203,7 +22382,7 @@ msgid "Sharing"
msgstr "Megosztóhely"
msgid "Motorcycle Dealer"
-msgstr "Motorkerékpár kereskedés"
+msgstr "Motorkerékpár-kereskedés"
msgid "Services:"
msgstr "Szolgáltatások:"
@@ -22215,7 +22394,7 @@ msgid "brand"
msgstr "márka"
msgid "oldtimer"
-msgstr "oldtimer"
+msgstr "veterán"
msgid "Safety inspection"
msgstr "Biztonsági vizsgálat"
@@ -22254,7 +22433,7 @@ msgid "shed"
msgstr "fészer"
msgid "stands"
-msgstr "hajlított korlát"
+msgstr "korlát"
msgid "wall_loops"
msgstr "kerékbefogó hurkok"
@@ -22266,28 +22445,28 @@ msgid "Bike Dealer"
msgstr "Kerékpárbolt"
msgid "Bicycles are sold"
-msgstr "Kerékpár árusítás"
+msgstr "Kerékpár-árusítás"
msgid "Second-hand bicycles are sold"
-msgstr "Használt kerékpár árusítás"
+msgstr "Használtkerékpár-árusítás"
msgid "Bicycles are repaired"
-msgstr "Kerékpárszerviz"
+msgstr "Kerékpárszerelés"
msgid "Bicycles are rented"
msgstr "Kerékpárkölcsönzés"
msgid "Free bicycle pump"
-msgstr "Ingyenes pumpálás"
+msgstr "Ingyenes kerékpárpumpa"
msgid "Tools for do-it-yourself repair (may be a bike co-operative)"
-msgstr "Szerszámok \"csináld magad\" szereléshez"
+msgstr "Szerszámok „csináld magad” szereléshez"
msgid "Bicycles are washed (for a fee)"
-msgstr "Kerékpármosás"
+msgstr "Kerékpármosás (díj ellenében)"
msgid "Public Bicycle Repair Station"
-msgstr "Önkiszolgáló kerékpáros szervizpont"
+msgstr "Önkiszolgáló kerékpárszerelő pont"
msgid "Chain tool"
msgstr "Láncbontó szerszám"
@@ -22350,7 +22529,7 @@ msgid "Stop Area"
msgstr "Állomás"
msgid "UIC reference"
-msgstr "UIC referencia"
+msgstr "UIC hivatkozás"
msgid "UIC name"
msgstr "UIC név"
@@ -22365,7 +22544,7 @@ msgid "Subway Entrance"
msgstr "Metrólejárat"
msgid "Station or amenities"
-msgstr "Megálló vagy komfort-szolgáltatók"
+msgstr "Állomás vagy komfortszolgáltatók"
msgid "Bus"
msgstr "Busz"
@@ -22435,7 +22614,7 @@ msgid "backward halt point"
msgstr "vissza megállóhely"
msgid "UIC-Reference"
-msgstr "UIC-kód"
+msgstr "UIC-hivatkozás"
msgid "Railway Halt"
msgstr "Vasúti megállóhely"
@@ -22447,10 +22626,10 @@ msgid "Railway Platform"
msgstr "Peron"
msgid "Reference (track number)"
-msgstr "Azonosító (vágány szám)"
+msgstr "Azonosító (vágányszám)"
msgid "Bus Station"
-msgstr "Autóbusz-állomás"
+msgstr "Autóbuszállomás"
msgid "Bus Stop"
msgstr "Buszmegálló"
@@ -22474,7 +22653,7 @@ msgid "Taxiway"
msgstr "Gurulóút"
msgid "Holding Position"
-msgstr ""
+msgstr "Várakozási hely"
msgid "Helipad"
msgstr "Helikopter-leszállóhely"
@@ -22483,7 +22662,7 @@ msgid "Apron"
msgstr "Forgalmi előtér (Apron)"
msgid "Plane Parking Position"
-msgstr "Repülőgép parkolóhely"
+msgstr "Repülőgép-parkolási pozíció"
msgid "Hangar"
msgstr "Hangár"
@@ -22498,10 +22677,10 @@ msgstr "igen"
msgctxt "airmark"
msgid "Beacon"
-msgstr ""
+msgstr "Repülési rádiós jeladó"
msgid "Navigationaid"
-msgstr ""
+msgstr "Repülési navigációs jelek"
msgid "Windsock"
msgstr "Szélzsák"
@@ -22520,7 +22699,7 @@ msgid "Accommodation"
msgstr "Szállások"
msgid "Hotel"
-msgstr "Hotel"
+msgstr "Szálloda"
msgid "Stars"
msgstr "Csillagok"
@@ -22535,7 +22714,7 @@ msgid "Motel"
msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
-msgstr "Vendégház/ Szállás és reggeli"
+msgstr "Vendégház"
msgid "Apartment"
msgstr "Apartman"
@@ -22544,10 +22723,10 @@ msgid "Number of apartments"
msgstr "Apartmanok száma"
msgid "Chalet"
-msgstr "Apartman"
+msgstr "Alpesi faház"
msgid "Hostel"
-msgstr "Hostel"
+msgstr "Ifjúsági szálló"
msgid "Alpine Hut"
msgstr "Hegyi menedékház"
@@ -22562,7 +22741,7 @@ msgid "Shower"
msgstr "Zuhanyzó"
msgid "seasonal"
-msgstr "szezonális"
+msgstr "időszakos"
msgid "Reservation"
msgstr "Foglalás"
@@ -22581,7 +22760,7 @@ msgstr "További leírás"
# RV / Recreational Vehicle
msgid "Caravan Site/RV Park"
-msgstr "Lakókocsipark/Lakóautó parkoló"
+msgstr "Lakókocsihely/Lakóautó-parkoló"
msgid "Number of places"
msgstr "Helyek száma"
@@ -22593,7 +22772,7 @@ msgid "Tents allowed"
msgstr "Sátrazás lehetséges"
msgid "Camping Site"
-msgstr "Sátrazóhely"
+msgstr "Kemping"
msgid "Food+Drinks"
msgstr "Étel-ital"
@@ -22605,7 +22784,7 @@ msgid "Microbrewery"
msgstr "Házi sörfőzde"
msgid "Outdoor seating"
-msgstr "Szabadtéri asztalok"
+msgstr "Kiülős helyek"
msgid "Takeaway"
msgstr "Elvitelre"
@@ -22614,16 +22793,16 @@ msgid "Delivery"
msgstr "Házhozszállítás"
msgid "Mo-Su 12:00-22:00"
-msgstr "Házhozszállítás"
+msgstr "Mo-Su 12:00-22:00"
msgid "Fast Food"
msgstr "Gyorsétterem"
msgid "Food Court"
-msgstr "Étkezőcsarnok"
+msgstr "Étkezőtér"
msgid "Cafe"
-msgstr "Kávézó"
+msgstr "Kávézó, cukrászda"
msgid "Ice cream"
msgstr "Fagylaltozó"
@@ -22659,23 +22838,23 @@ msgid "Map"
msgstr "Térkép"
msgid "A board with a map."
-msgstr "Egy asztal/tábla térképpel."
+msgstr "Egy tábla térképpel."
msgid "Detail Grade"
-msgstr "Kategória"
+msgstr "Részletesség"
msgid "topo"
-msgstr "terep"
+msgstr "topográfiai"
msgid "street"
-msgstr "utca"
+msgstr "utcaszintű"
msgid "scheme"
msgstr "vázlat"
# Irányjelző táblának fordítják, de félrevezető lenne. talán a panoráma térkép beszédesebb. Kérdéses.
msgid "toposcope"
-msgstr "panoráma térkép"
+msgstr "panorámatérkép"
msgid "Shown Area"
msgstr "Mutatott terület"
@@ -22714,13 +22893,13 @@ msgid "Information Board"
msgstr "Információs tábla"
msgid "A board with information."
-msgstr "Információs tábla."
+msgstr "Tábla valamilyen tájékoztatással."
msgid "Board Content"
msgstr "Tábla tartalma"
msgid "notice"
-msgstr "hirdetőtábla"
+msgstr "hirdetések"
msgid "history"
msgstr "történelem"
@@ -22743,13 +22922,13 @@ msgstr "Útjelző"
msgid ""
"A Signpost/Guidepost to indicate the directions to different destinations."
msgstr ""
-"Irányjelző/útjelző tábla a különféle uticélok irányainak meghatározásához."
+"Irányjelző/útjelző tábla a különféle úticélok irányainak meghatározásához."
msgid "Information Terminal"
msgstr "Információs terminál"
msgid "Information access via electronic methods."
-msgstr "Elektronikus csatornákon hozzáférhető információk."
+msgstr "Elektronikus módon hozzáférhető információk."
msgid "Closer description"
msgstr "Pontosabb leírás"
@@ -22758,8 +22937,7 @@ msgid "Audio Guide"
msgstr "Audioguide (tárlatvezetés hangfelvétellel)"
msgid "Information using headphones or a mobile phone."
-msgstr ""
-"Információk fejhallgatókkal vagy mobiltelefon használattal érhetőek el."
+msgstr "Fejhallgató vagy mobiltelefon használatával elérhető információ."
msgid "Audioguide via mobile phone?"
msgstr "Tárlatvezetés mobiltelefonnal?"
@@ -22783,7 +22961,7 @@ msgid "3D"
msgstr "3D"
msgid "Number of screens"
-msgstr "Képernyők száma"
+msgstr "Mozivásznak száma"
msgid "Minimum age"
msgstr "Korhatár"
@@ -22813,10 +22991,10 @@ msgid "Swimming Pool"
msgstr "Úszómedence"
msgid "Used for the water area only."
-msgstr "Csak a medence jelölésére használatos."
+msgstr "Csak a vízfelület jelölésére használatos."
msgid "Fitness Station"
-msgstr "Szabadtéri tornapálya"
+msgstr "Fitneszpark"
msgid "Sauna"
msgstr "Szauna"
@@ -22831,17 +23009,17 @@ msgid "Picnic Site"
msgstr "Piknikezőhely"
msgid "Fireplace"
-msgstr "Tűzrakóhely"
+msgstr "Beltéri tűzrakóhely"
msgid "Picnic Table"
-msgstr "Piknik asztal"
+msgstr "Piknikasztal"
msgid "Public Grill"
msgstr "Nyilvános grillezőhely"
msgctxt "grill"
msgid "Fuel"
-msgstr "Fűtőanyag"
+msgstr "Tűzelő"
msgid "charcoal"
msgstr "faszén"
@@ -22856,7 +23034,7 @@ msgid "Bird Hide"
msgstr "Madárles"
msgid "Night Club"
-msgstr "Éjszakai klub"
+msgstr "Diszkó"
msgid "Casino"
msgstr "Kaszinó"
@@ -22890,7 +23068,7 @@ msgstr "falfestmény"
# Bármely anaygból készült kissebb-nagyobb szobor, művészei alkotás. Pl. lehet fából is vagy üvegből stb.
msgid "sculpture"
-msgstr "szobor"
+msgstr "absztrakt szobor"
msgid "statue"
msgstr "szobor"
@@ -22914,7 +23092,7 @@ msgid "video"
msgstr "videó"
msgid "Place of Worship"
-msgstr "Vallási hely"
+msgstr "Istentiszteleti hely"
msgid "Church"
msgstr "Templom"
@@ -22926,7 +23104,7 @@ msgid "basilica"
msgstr "bazilika"
msgid "cathedral"
-msgstr "katedrális (székesegyház)"
+msgstr "székesegyház (katedrális)"
msgid "chapel"
msgstr "kápolna"
@@ -22935,7 +23113,7 @@ msgid "church"
msgstr "templom"
msgid "temple"
-msgstr "istenháza (főtemplom)"
+msgstr "nem keresztény templom"
msgctxt "christian"
msgid "anglican"
@@ -22979,7 +23157,7 @@ msgstr "mormon"
msgctxt "christian"
msgid "new_apostolic"
-msgstr "apostoli"
+msgstr "Új Apostoli Egyház"
msgctxt "christian"
msgid "orthodox"
@@ -22987,7 +23165,7 @@ msgstr "ortodox"
msgctxt "christian"
msgid "pentecostal"
-msgstr "pünkösdi"
+msgstr "pünkösdista"
msgctxt "christian"
msgid "presbyterian"
@@ -23034,18 +23212,18 @@ msgstr "zsinagóga"
msgctxt "jewish"
msgid "orthodox"
-msgstr "ortodox"
+msgstr "ortodox zsidó"
msgctxt "jewish"
msgid "conservative"
-msgstr "konzervatív"
+msgstr "konzervatív zsidó"
msgctxt "jewish"
msgid "reform"
-msgstr "reform"
+msgstr "reformzsidó"
msgid "Buddhist Temple"
-msgstr "Buddhista Templom"
+msgstr "Buddhista szentély"
msgid "theravada"
msgstr "théraváda buddhizmus"
@@ -23057,28 +23235,28 @@ msgid "vajrayana"
msgstr "vadzsrajána buddhizmus"
msgid "Hindu Temple"
-msgstr "Hindu Templom"
+msgstr "Hindu templom"
msgid "vaishnavism"
-msgstr "vaishnava"
+msgstr "vaisnava"
msgid "shaivism"
-msgstr "shaivism (hindu)"
+msgstr "saivizmus (hindu)"
msgid "shaktism"
-msgstr "shaktism (hindu)"
+msgstr "saktizmus (hindu)"
msgid "smartism"
-msgstr "smartism (hindu)"
+msgstr "szmartizmus (hindu)"
msgid "Shinto Shrine"
msgstr "Sintoista szentély"
msgid "Other Place of Worship"
-msgstr "Egyéb templom"
+msgstr "Egyéb istentiszteleti hely"
msgid "Public Building"
-msgstr "Nyilvános épület"
+msgstr "Középület"
msgid "Town Hall"
msgstr "Városháza"
@@ -23087,7 +23265,7 @@ msgid "Community Centre"
msgstr "Közösségi ház"
msgid "Embassy"
-msgstr "Követség"
+msgstr "Nagykövetség"
msgid "Courthouse"
msgstr "Bíróság"
@@ -23099,7 +23277,7 @@ msgid "Police"
msgstr "Rendőrség"
msgid "Ranger Station"
-msgstr "Vadőr állomás"
+msgstr "Nemzeti park látogatóközpontja"
msgid "Fire Station"
msgstr "Tűzoltóság"
@@ -23141,7 +23319,7 @@ msgid "Hospital"
msgstr "Kórház"
msgid "Clinic"
-msgstr "Klinika"
+msgstr "Rendelőintézet"
msgid "Doctor''s Office"
msgstr "Orvosi rendelő"
@@ -23156,10 +23334,10 @@ msgid "Dispensing"
msgstr "Receptkiváltás"
msgid "Baby Hatch/Safe Haven"
-msgstr "Babamentő inkubátor/Menedék"
+msgstr "Újszülöttmentő inkubátor"
msgid "Emergency Access Point"
-msgstr "Vészhelyzeti hozzáférési pont"
+msgstr "Vészhelyzeti bejutási pont"
msgid "Point Number"
msgstr "Pont száma"
@@ -23168,7 +23346,7 @@ msgid "Point Name"
msgstr "Pont neve"
msgid "Emergency Phone Number"
-msgstr "Vészhelyzeti telefonszám"
+msgstr "Segélyhívó telefonszám"
msgid "(Use number as shown on plate.)"
msgstr "(A táblán látható számot használd.)"
@@ -23183,7 +23361,7 @@ msgid "Ambulance Station"
msgstr "Mentőállomás"
msgid "Automated Defibrillator"
-msgstr "Automata defibrillátor"
+msgstr "Automatikus defibrillátor"
msgid "Location description"
msgstr "Helyszínleírás"
@@ -23192,22 +23370,22 @@ msgid "Phone Number"
msgstr "Telefonszám"
msgid "Located inside a building?"
-msgstr "Épületen belül van elhelyezve?"
+msgstr "Épületen belül van-e elhelyezve?"
msgid "Last check date (YYYY-MM-DD)"
-msgstr "Utolsó vizsgálat dátuma (YYYY-MM-DD)"
+msgstr "Utolsó ellenőrzés dátuma (YYYY-MM-DD)"
msgid "Last check note"
-msgstr "Utolsó vizsgálati jegyzet"
+msgstr "Utolsó ellenőrzési megjegyzés"
msgid "Fire Extinguisher"
-msgstr "Tűzoltó készülék"
+msgstr "Tűzoltókészülék"
msgid "Indoor"
msgstr "Beltéri"
msgid "Fire Hose"
-msgstr "Tűzoltó tömlő"
+msgstr "Tűzoltótömlő"
msgid "Fire Hydrant"
msgstr "Tűzcsap"
@@ -23229,14 +23407,14 @@ msgid "pond"
msgstr "tó"
msgid "Diameter (in mm)"
-msgstr "Átmérő (mm-ben)"
+msgstr "Átmérő (mm)"
msgid "Hydrant Position"
-msgstr "Tűzcsap pozíció"
+msgstr "Tűzcsap helye"
msgctxt "hydrant position"
msgid "lane"
-msgstr "sáv"
+msgstr "úttest"
msgctxt "hydrant position"
msgid "parking_lot"
@@ -23251,7 +23429,7 @@ msgid "green"
msgstr "zöldfelület"
msgid "Pressure (in bar)"
-msgstr "Nyomás (barban)"
+msgstr "Nyomás (bar)"
msgid "suction"
msgstr "szivattyús"
@@ -23260,22 +23438,22 @@ msgid "Count"
msgstr "Darabszám"
msgid "Water Tank"
-msgstr "Tűzivíz tartály"
+msgstr "Tűzivíztartály"
msgid "Volume (in liters)"
-msgstr "Térfogat (literben)"
+msgstr "Űrtartalom (liter)"
msgid "Assembly Point"
msgstr "Gyülekezőhely"
msgid "Emergency Phone"
-msgstr "Segélykérő telefon"
+msgstr "Segélyhívó telefon"
msgid "Siren"
msgstr "Sziréna"
msgid "pneumatic"
-msgstr "sűrített_levegős"
+msgstr "sűrített levegős"
msgid "electronic"
msgstr "elektromos"
@@ -23296,35 +23474,35 @@ msgid "air_raid"
msgstr "légvédelmi"
msgid "civil_defense"
-msgstr "lakosságvédelmi"
+msgstr "polgári védelmi"
msgid "Range (in meters)"
-msgstr "Hatótáv (méterben)"
+msgstr "Hatótávolság (méter)"
msgid "Social Facility"
-msgstr "Szociális intézmények"
+msgstr "Szociális létesítmény"
msgid "Nursing Home"
-msgstr "Idősek otthona"
+msgstr "Ápolóotthon"
msgid "Group Home"
-msgstr "Közösségi lakóépület"
+msgstr "Lakóotthon"
msgid "For"
-msgstr "Kinek"
+msgstr "Célcsoport"
msgid "Assisted Living"
-msgstr "Lakóotthon"
+msgstr "Bentlakásos otthon"
msgid "Outreach"
-msgstr "Gondozási központ"
+msgstr "Szolgáltatóközpont hátrányos helyzetűeknek"
msgctxt "social_facility"
msgid "Shelter"
-msgstr "Hajléktalanszálló"
+msgstr "Átmeneti szálló"
msgid "Food Bank"
-msgstr "Szociális étkeztetés"
+msgstr "Élelmiszerbank"
msgid "Toilets/Restrooms"
msgstr "Mosdók/WC"
@@ -23339,13 +23517,13 @@ msgstr "Férfi"
msgctxt "restroom"
msgid "Unisex"
-msgstr "Koedukált"
+msgstr "Közös"
msgid "flush"
-msgstr "öblítéses"
+msgstr "öblítés"
msgid "pitlatrine"
-msgstr "árnyékszék/guggolós"
+msgstr "árnyékszék"
msgid "chemical"
msgstr "kémiai"
@@ -23379,26 +23557,26 @@ msgid "Post Box"
msgstr "Postaláda"
msgid "Collection times"
-msgstr "Begyűjtési időpontok"
+msgstr "Ürítési idő"
msgctxt "post_box"
msgid "pillar"
-msgstr "oszlop"
+msgstr "lábon álló"
msgctxt "post_box"
msgid "lamp"
-msgstr "oszlopon álló"
+msgstr "villanyoszlopra rögzített"
msgctxt "post_box"
msgid "wall"
-msgstr "fali"
+msgstr "falra rögzített"
msgctxt "post_box"
msgid "meter"
-msgstr "postakész"
+msgstr "bélyegzős"
msgid "Drive through"
-msgstr "Áthajtó (autós)"
+msgstr "Autóval használható (áthajtós)"
msgid "Telephone"
msgstr "Telefon"
@@ -23417,7 +23595,7 @@ msgid "Internet Cafe"
msgstr "Internetkávézó"
msgid "Internet Access"
-msgstr "Internet hozzáférés"
+msgstr "Internetcsatlakozás"
msgid "Clock"
msgstr "Óra"
@@ -23441,10 +23619,10 @@ msgid "Visibility/readability"
msgstr "Láthatóság/olvashatóság"
msgid "house (up to 5m)"
-msgstr "ház mellől (5 méterről)"
+msgstr "ház mellől (5 méterig)"
msgid "street (up to 20m)"
-msgstr "utcáról (20 méterről)"
+msgstr "utcáról (20 méterig)"
msgid "area (more than 20m)"
msgstr "távolról (20 méteren túlról)"
@@ -23471,7 +23649,7 @@ msgid "Batteries"
msgstr "Akkumulátor"
msgid "Cans"
-msgstr "Konzerv"
+msgstr "Konzervdoboz"
msgid "Cardboard"
msgstr "Karton"
@@ -23483,7 +23661,7 @@ msgid "Glass"
msgstr "Üveg"
msgid "Glass Bottles"
-msgstr "Üveg göngyöleg"
+msgstr "Üvegpalack"
msgid "Green Waste"
msgstr "Zöldhulladék"
@@ -23495,7 +23673,7 @@ msgid "Plastic"
msgstr "Műanyag"
msgid "Plastic Bottles"
-msgstr "Műanyag flakon"
+msgstr "Műanyagpalack"
msgid "Plastic Packaging"
msgstr "Műanyag csomagolóanyag"
@@ -23513,10 +23691,10 @@ msgid "Waste"
msgstr "Kommunális hulladék"
msgid "Recycling Centre"
-msgstr "Hulladékhasznosító központ"
+msgstr "Hulladékudvar"
msgid "Waste Disposal/Dumpster"
-msgstr "Hulladék leadó/Kuka"
+msgstr "Szemeteskonténer"
msgid "Sanitary Dump Station"
msgstr "Szennyvízleeresztő állomás"
@@ -23537,22 +23715,22 @@ msgid "Backrest"
msgstr "Háttámla"
msgid "Amount of Seats"
-msgstr "Helyek száma"
+msgstr "Ülőhelyek száma"
msgid "Type of shelter"
msgstr "Esőbeálló típusa"
msgctxt "shelter"
msgid "basic_hut"
-msgstr "egyszerű kunyhó"
+msgstr "Bivakkunyhó"
msgctxt "shelter"
msgid "lean_to"
-msgstr "fekvőhely"
+msgstr "Háromfalú fészer"
msgctxt "shelter"
msgid "picnic_shelter"
-msgstr "szaletli"
+msgstr "fedett piknikezőhely"
msgctxt "shelter"
msgid "public_transport"
@@ -23564,7 +23742,7 @@ msgstr "esőház"
msgctxt "shelter"
msgid "wildlife_hide"
-msgstr "állatmegfigyelő rejtekhely"
+msgstr "vadfigyelő rejtek"
msgid "Hunting Stand"
msgstr "Magasles"
@@ -23577,13 +23755,13 @@ msgid "Lockable"
msgstr "Zárható"
msgid "Water Point"
-msgstr "Vízcsap"
+msgstr "Vízcsatlakozás lakókocsinak"
msgid "Animal watering place"
-msgstr "Állat itató hely"
+msgstr "Állatitató hely"
msgid "Compressed Air"
-msgstr "Sűrített levegő/kerékfújó"
+msgstr "Sűrített levegő"
msgid "Valves"
msgstr "Szelep típusa"
@@ -23592,7 +23770,7 @@ msgid "Dunlop (Woods)"
msgstr "Dunlop (kerékpár)"
msgid "Schrader"
-msgstr "Schrader (autó)"
+msgstr "Autószelep (Schrader)"
msgid "Sclaverand (Presta)"
msgstr "Presta (szingó, tű, francia)"
@@ -23604,7 +23782,7 @@ msgid "Advertising Column"
msgstr "Hírdetőoszlop"
msgid "Billboard"
-msgstr "Hírdetőtábla"
+msgstr "Óriásplakát"
msgid "Sports"
msgstr "Sport"
@@ -23628,10 +23806,10 @@ msgid "artificial_turf"
msgstr "műfű"
msgid "decoturf"
-msgstr "DecoTurf"
+msgstr "Műanyag (DecoTurf tenisz)"
msgid "tartan"
-msgstr "gumiőrlemény"
+msgstr "műanyag (tartan)"
msgid "Racetrack"
msgstr "Versenypálya"
@@ -23670,7 +23848,7 @@ msgstr "Természetes"
msgctxt "golf"
msgid "Frontal Water hazard"
-msgstr "Vízakadály (sárga karó)"
+msgstr "Frontális vízakadály (sárga karó)"
msgctxt "golf"
msgid "Lateral water hazard"
@@ -23719,16 +23897,16 @@ msgid "track"
msgstr "futósáv"
msgid "Nine-pin Bowling"
-msgstr "9 bábus bowling"
+msgstr "Teke"
msgid "Ten-pin Bowling"
-msgstr "10 bábus bowling"
+msgstr "Bowling"
msgid "Archery"
msgstr "Íjászat"
msgid "Track and Field Athletics"
-msgstr "Klasszikus atlétika"
+msgstr "Atlétika"
msgid "Running"
msgstr "Futás"
@@ -23792,7 +23970,7 @@ msgid "water_park"
msgstr "akvapark"
msgid "Scuba Diving"
-msgstr "Búvárkodás"
+msgstr "Palackos búvárkodás"
msgid "Piste type"
msgstr "Sípálya típusa"
@@ -23801,7 +23979,7 @@ msgid "downhill"
msgstr "lesikló"
msgid "nordic"
-msgstr "nordic"
+msgstr "északi (sífutás)"
msgid "skitour"
msgstr "sítúra"
@@ -23810,10 +23988,10 @@ msgid "sled"
msgstr "szánkó"
msgid "sleigh"
-msgstr "szán"
+msgstr "szán (lovas, kutya-)"
msgid "snow_park"
-msgstr "sípark"
+msgstr "hópark"
msgid "Difficulty"
msgstr "Nehézség"
@@ -23836,7 +24014,7 @@ msgstr "tapasztalt"
msgctxt "piste:difficulty"
msgid "expert"
-msgstr "szakértő"
+msgstr "profi"
msgctxt "piste:difficulty"
msgid "freeride"
@@ -23851,7 +24029,7 @@ msgstr "klasszikus"
msgctxt "piste:grooming"
msgid "mogul"
-msgstr "Mogul síelés"
+msgstr "mogul síelés"
msgctxt "piste:grooming"
msgid "skating"
@@ -23859,7 +24037,7 @@ msgstr "korcsolya"
msgctxt "piste:grooming"
msgid "classic;skating"
-msgstr "Klasszikus korcsolya"
+msgstr "klasszikus korcsolya"
msgctxt "piste:grooming"
msgid "scooter"
@@ -23876,16 +24054,16 @@ msgid "Sport (Ball)"
msgstr "Labdajátékok"
msgid "Soccer"
-msgstr "Foci"
+msgstr "Futball"
msgid "Australian Football"
-msgstr "Ausztrál foci"
+msgstr "Ausztrál futball"
msgid "American Football"
-msgstr "Amerikai foci"
+msgstr "Amerikai futball"
msgid "Canadian Football"
-msgstr "Kanadai foci"
+msgstr "Kanadai futball"
msgid "Gaelic Games"
msgstr "Kelta játékok"
@@ -23901,13 +24079,13 @@ msgid "Camogie"
msgstr "Camogie"
msgid "Rounders"
-msgstr "Méta játék"
+msgstr "Métajáték"
msgid "Rugby League"
-msgstr "Ligarögbi"
+msgstr "Rögbi (League)"
msgid "Rugby Union"
-msgstr "Uniós rögbi"
+msgstr "Rögbi (Union)"
msgid "Baseball"
msgstr "Baseball"
@@ -23931,7 +24109,7 @@ msgid "golf_course"
msgstr "golfpálya"
msgid "Boule"
-msgstr "Petanque"
+msgstr "Pétanque (boule)"
msgid "Lawn Bowling"
msgstr "Gyepteke"
@@ -23955,7 +24133,7 @@ msgid "Racquetball"
msgstr "Racquetball"
msgid "Table Tennis/Ping-Pong"
-msgstr "Asztalitenisz/Ping-Pong"
+msgstr "Asztalitenisz / ping-pong"
msgid "Tennis"
msgstr "Tenisz"
@@ -23964,7 +24142,7 @@ msgid "Motorsport"
msgstr "Motorsport"
msgid "Kart Racing"
-msgstr "Gokart versenyzés"
+msgstr "Gokart"
msgid "Motocross"
msgstr "Motokrossz"
@@ -23988,7 +24166,7 @@ msgid "RC Car"
msgstr "Távirányítós autó"
msgid "Man Made"
-msgstr "Építmények"
+msgstr "Építmény"
msgctxt "building"
msgid "roof"
@@ -24004,39 +24182,39 @@ msgstr "garázsok"
msgctxt "building"
msgid "school"
-msgstr "iskola"
+msgstr "iskolapület"
msgctxt "building"
msgid "commercial"
-msgstr "kereskedelmi"
+msgstr "üzleti épület"
msgctxt "building"
msgid "service"
-msgstr "gépház"
+msgstr "kiszolgáló épület"
msgctxt "building"
msgid "train_station"
-msgstr "vasútállomás"
+msgstr "vasútállomás-épület"
msgctxt "building"
msgid "barn"
-msgstr "csűr"
+msgstr "pajta"
msgctxt "building"
msgid "stable"
-msgstr "istálló"
+msgstr "lóistálló"
msgctxt "building"
msgid "cabin"
-msgstr "kunyhó"
+msgstr "kis faház"
msgctxt "building"
msgid "farm_auxiliary"
-msgstr "gazdasági_épület"
+msgstr "tanya melléképülete"
msgctxt "building"
msgid "transportation"
-msgstr "szállítmányozás"
+msgstr "közlekedési épület"
msgctxt "building"
msgid "greenhouse"
@@ -24044,23 +24222,23 @@ msgstr "üvegház"
msgctxt "building"
msgid "office"
-msgstr "iroda"
+msgstr "irodaház"
msgctxt "building"
msgid "university"
-msgstr "egyetem"
+msgstr "egyetemi épület"
msgctxt "building"
msgid "college"
-msgstr ""
+msgstr "főiskolai épület"
msgctxt "building"
msgid "hospital"
-msgstr "kórház"
+msgstr "kórházépület"
msgctxt "building"
msgid "kindergarten"
-msgstr "óvoda"
+msgstr "óvodaépület"
msgctxt "building"
msgid "manufacture"
@@ -24068,19 +24246,19 @@ msgstr "gyárépület"
msgctxt "building"
msgid "warehouse"
-msgstr "raktár"
+msgstr "raktárépület"
msgctxt "building"
msgid "retail"
-msgstr "kiskereskedelem"
+msgstr "kiskereskedelmi épület (bolt)"
msgctxt "building"
msgid "shed"
-msgstr "pajta/gépszín"
+msgstr "fészer"
msgctxt "building"
msgid "storage_tank"
-msgstr "Tárolótartály"
+msgstr "tárolótartály"
msgctxt "building"
msgid "supermarket"
@@ -24096,7 +24274,7 @@ msgstr "siló"
msgctxt "building"
msgid "cowshed"
-msgstr "tehénistálló"
+msgstr "szarvasmarha-istálló"
msgctxt "building"
msgid "construction"
@@ -24108,7 +24286,7 @@ msgstr "bazilika"
msgctxt "building"
msgid "cathedral"
-msgstr "katedrális (székesegyház)"
+msgstr "székesegyház (katedrális)"
msgctxt "building"
msgid "chapel"
@@ -24120,7 +24298,7 @@ msgstr "templom"
msgctxt "building"
msgid "temple"
-msgstr "istenháza (főtemplom)"
+msgstr "nem keresztény templom"
msgctxt "building"
msgid "mosque"
@@ -24136,7 +24314,7 @@ msgstr "trafótorony"
msgctxt "building"
msgid "public"
-msgstr "nyilvános"
+msgstr "középület"
msgctxt "building"
msgid "ruins"
@@ -24155,15 +24333,15 @@ msgstr "lakóépület"
msgctxt "building"
msgid "apartments"
-msgstr "apartmanok"
+msgstr "társasház"
msgctxt "building"
msgid "house"
-msgstr "ház"
+msgstr "családi ház"
msgctxt "building"
msgid "hotel"
-msgstr "hotel"
+msgstr "szállodaépület"
msgctxt "building"
msgid "hut"
@@ -24171,33 +24349,33 @@ msgstr "kunyhó"
msgctxt "building"
msgid "bungalow"
-msgstr ""
+msgstr "bungaló"
msgctxt "building"
msgid "dormitory"
-msgstr "kollégium"
+msgstr "kollégiumépület"
msgctxt "building"
msgid "terrace"
-msgstr "terasz"
+msgstr "sorház"
msgctxt "building"
msgid "detached"
-msgstr "magában álló"
+msgstr "egyedül álló családi ház (UK)"
msgctxt "building"
msgid "farm"
-msgstr "farm"
+msgstr "tanya"
msgid "Building part"
msgstr "Épületrész"
msgctxt "building"
msgid "Skipped Levels"
-msgstr "Kihagyott emelet"
+msgstr "Kihagyott szintek"
msgid "Skipped height (meters)"
-msgstr "Kihagyott magasság (méterben)"
+msgstr "Kihagyott magasság (méter)"
msgid "Entrance"
msgstr "Bejárat"
@@ -24208,7 +24386,7 @@ msgstr "igen"
msgctxt "entrance"
msgid "main"
-msgstr "fő"
+msgstr "főbejárat"
msgctxt "entrance"
msgid "service"
@@ -24224,17 +24402,17 @@ msgstr "vészkijárat"
msgctxt "entrance"
msgid "staircase"
-msgstr "lépcsőház"
+msgstr "lépcsőházbejárat"
msgctxt "entrance"
msgid "home"
-msgstr ""
+msgstr "lakás vagy ház bejárata"
msgid "Entrance number"
msgstr "Bejárat száma"
msgid "Flat numbers"
-msgstr "Lakás számok"
+msgstr "Lakás száma"
msgid "Tower"
msgstr "Torony"
@@ -24243,7 +24421,7 @@ msgid "Tower type"
msgstr "Toronytípus"
msgid "communication"
-msgstr "telekommunikációs"
+msgstr "távközlési"
msgid "observation"
msgstr "megfigyelő"
@@ -24252,7 +24430,7 @@ msgid "Flagpole"
msgstr "Zászlórúd"
msgid "Cross"
-msgstr ""
+msgstr "Kereszt"
msgid "Works"
msgstr "Gyár"
@@ -24282,7 +24460,7 @@ msgstr "trágya"
msgctxt "content"
msgid "oil"
-msgstr "olaj"
+msgstr "kőolaj"
msgctxt "content"
msgid "sewage"
@@ -24290,7 +24468,7 @@ msgstr "szennyvíz"
msgctxt "content"
msgid "silage"
-msgstr "siló"
+msgstr "silótakarmány"
msgctxt "content"
msgid "slurry"
@@ -24317,19 +24495,19 @@ msgid "Function"
msgstr "Funkció"
msgid "winding"
-msgstr "szállító"
+msgstr "szállítás"
msgid "air"
-msgstr "szellőztető"
+msgstr "szellőztetés"
msgid "Depth in meters"
-msgstr "Mélység méterben"
+msgstr "Mélység (méter)"
msgid "Resource"
msgstr "Nyersanyag"
msgid "aggregate"
-msgstr "aggregátum"
+msgstr "zúzott kő"
msgid "bauxite"
msgstr "bauxit"
@@ -24341,7 +24519,7 @@ msgid "copper"
msgstr "réz"
msgid "dimension_stone"
-msgstr "térkő"
+msgstr "vágott kő"
msgid "gold"
msgstr "arany"
@@ -24389,24 +24567,24 @@ msgid "Adit"
msgstr "Bányatárna (vízszintes)"
msgid "Length in meters"
-msgstr "Hossz méterben"
+msgstr "Hossz (méter)"
msgid "Pipeline"
msgstr "Csővezeték"
msgctxt "pipeline"
msgid "underwater"
-msgstr "vízalatti"
+msgstr "víz alatti"
msgctxt "pipeline"
msgid "overground"
msgstr "felszíni"
msgid "Pipeline Marker"
-msgstr "Közműjelző tábla"
+msgstr "Csővezeték helyének jelölője"
msgid "Pipeline Valve"
-msgstr "Elzáró szelep"
+msgstr "Csővezetékszelep"
msgid "Water Tower"
msgstr "Víztorony"
@@ -24415,7 +24593,7 @@ msgid "Water Works"
msgstr "Vízmű"
msgid "Wastewater Treatment Plant"
-msgstr "Szennyvíztisztító telep"
+msgstr "Szennyvízkezelő telep"
msgid "Watermill"
msgstr "Vízimalom"
@@ -24434,19 +24612,19 @@ msgid "Beacon"
msgstr ""
msgid "Street Lamp"
-msgstr "Lámpaoszlop"
+msgstr "Utcai lámpa"
msgid "Monitoring Station"
msgstr "Megfigyelőállomás"
msgid "Monitoring:"
-msgstr "Felügyelet:"
+msgstr "Megfigyelés:"
msgid "Water level"
msgstr "Vízszint"
msgid "Tide Level"
-msgstr "Árapály szint"
+msgstr "Árapályszint"
msgid "Groundwater"
msgstr "Talajvíz"
@@ -24455,19 +24633,19 @@ msgid "Traffic"
msgstr "Közlekedés"
msgid "Air Quality"
-msgstr "Levegő minőség"
+msgstr "Levegőminőség"
msgid "Noise"
msgstr "Zaj"
msgid "GPS Signals"
-msgstr "GPS jelek"
+msgstr "GPS-jelek"
msgid "GLONASS Signals"
-msgstr "GLONASS jelek"
+msgstr "GLONASS-jelek"
msgid "Galileo Signals"
-msgstr "Galileo jelek"
+msgstr "Galileo-jelek"
msgid "Weather"
msgstr "Időjárás"
@@ -24476,16 +24654,16 @@ msgid "Radiation"
msgstr "Sugárzás"
msgid "Seismic Activity"
-msgstr "Szeizmikus aktivitás"
+msgstr "Szeizmikus tevékenység"
msgid "Recording:"
-msgstr "Felvétel:"
+msgstr "Rögzítés:"
msgid "Automated"
-msgstr "Automata"
+msgstr "Automatizált"
msgid "Manually"
-msgstr "Manuális"
+msgstr "Kézi"
msgid "Remote"
msgstr "Távvezérelt"
@@ -24557,22 +24735,22 @@ msgid "ceiling"
msgstr "plafon"
msgid "Direction in degrees"
-msgstr "Irány fokban"
+msgstr "Irány (fok)"
msgid "Inclination in degrees"
-msgstr "Dőlésszög"
+msgstr "Dőlésszög (fok)"
msgid "Bridges"
msgstr "Hidak"
msgid "aqueduct"
-msgstr "akvadukt"
+msgstr "ókori vízvezeték (akvadukt)"
msgid "boardwalk"
-msgstr "sétány"
+msgstr "megemelt járda"
msgid "cantilever"
-msgstr "tartókaros"
+msgstr "konzolos híd"
msgid "covered"
msgstr "fedett"
@@ -24581,10 +24759,10 @@ msgid "low_water_crossing"
msgstr "gázló"
msgid "trestle"
-msgstr "állványhíd"
+msgstr "gerendahíd"
msgid "viaduct"
-msgstr "viadukt"
+msgstr "völgyhíd (viadukt)"
msgid "Structure"
msgstr "Szerkezet"
@@ -24650,14 +24828,14 @@ msgid "pivot_pier"
msgstr "forgóhíd középpillér"
msgid "Bridge outline"
-msgstr "Híd körvonal"
+msgstr "Híd körvonala"
msgctxt "preset group"
msgid "Military"
-msgstr "Katonai"
+msgstr "Katonaság"
msgid "Airfield"
-msgstr "Légibázis"
+msgstr "Repülőtér"
msgid "Barracks"
msgstr "Laktanya/kaszárnya"
@@ -24666,7 +24844,7 @@ msgid "Bunker"
msgstr "Bunker"
msgid "pillbox"
-msgstr "géppuskafészek"
+msgstr "géppuskafészek (elhagyott, II. világháborús)"
msgid "munitions"
msgstr "lőszer"
@@ -24686,7 +24864,7 @@ msgid "Historic"
msgstr "Történelmi"
msgid "Ruins"
-msgstr "Romok"
+msgstr "Rom"
msgid "Range"
msgstr "Lőtér"
@@ -24698,16 +24876,16 @@ msgid "Power Plant"
msgstr "Erőmű"
msgid "Output forms of energy (optional):"
-msgstr "Az energia kimenő formái (opcionális):"
+msgstr "Az energia kimeneti formái (opcionális):"
msgid "Power Generator"
-msgstr "Energiatermelők"
+msgstr "Áramfejlesztő"
msgid "Biofuel Power Generator"
-msgstr "Bioüzemanyag alapú"
+msgstr "Bioüzemanyag-generátor"
msgid "Generator Type"
-msgstr "Generátor típus"
+msgstr "Generátortípus"
msgid "gas_turbine"
msgstr "gázturbina"
@@ -24716,13 +24894,13 @@ msgid "reciprocating_engine"
msgstr "dugattyús motor"
msgid "steam_generator"
-msgstr "Gőz generátor"
+msgstr "gőzgenerátor"
msgid "Biogas Power Generator"
-msgstr "Biogáz alapú"
+msgstr "biogáz-generátor"
msgid "Biomass Power Generator"
-msgstr "Biomassza alapú"
+msgstr "Biomassza-generátor"
msgid "Method"
msgstr "Mód"
@@ -24746,7 +24924,7 @@ msgid "anaerobic_digestion / combustion"
msgstr "anaerob lebontás / égetés"
msgid "pyrolysis"
-msgstr "a pirolízis"
+msgstr "pirolízis"
msgid "combustion"
msgstr "égés"
@@ -24755,22 +24933,22 @@ msgid "steam_turbine"
msgstr "gőzturbina"
msgid "Coal Power Generator"
-msgstr "Széntüzelésű"
+msgstr "Széngenerátor"
msgid "Gas Power Generator"
-msgstr "Földgáz/CNG alapú"
+msgstr "Földgáz-generátor"
msgid "combined_cycle"
msgstr "kombinált ciklusú"
msgid "Oil Power Generator"
-msgstr "Kőolaj alapú"
+msgstr "Kőolaj-generátor"
msgid "Diesel Power Generator"
-msgstr "Gázolaj-tüzelésű"
+msgstr "Gázolaj-generátor"
msgid "Gasoline Power Generator"
-msgstr "Benzintüzelésű"
+msgstr "Benzin-generátor"
msgid "Nuclear Reactor"
msgstr "Atomreaktor"
@@ -24805,31 +24983,31 @@ msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr "Forralóvizes reaktor 6 (BWR-6)"
msgid "CANada Deuterium Uranium reactor (CANDU)"
-msgstr "Kanadai nehézhidrogénes urán reaktor (CANDU)"
+msgstr "Kanadai nehézhidrogénes uránreaktor (CANDU)"
msgid "cold-fusion"
-msgstr "hideg-fúzió"
+msgstr "hideg fúzió"
msgid "fusion"
msgstr "fúzió"
msgid "China Pressurized Reactor (CPR-1000)"
-msgstr "Kínai nyomóvizes reaktor (CPR-1000)"
+msgstr "Kínai nyomottvizes reaktor (CPR-1000)"
msgid "European Pressurized Reactor (EPR)"
-msgstr "Európai nyomóvizes reaktor (EPR)"
+msgstr "Európai nyomottvizes reaktor (EPR)"
msgid "Inertial Confinement Fusion (ICF)"
msgstr "Behatárolt inerciális fúzió (ICF)"
msgid "Pressurized water reactor (PWR)"
-msgstr "Nyomóvizes reaktor (PWR)"
+msgstr "Nyomottvizes reaktor (PWR)"
msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
-msgstr "Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000) reaktor"
+msgstr "Csatorna-típusú, nagy energiakimenetű reaktor 1000 (RBMK-1000)"
msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
-msgstr "Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500) reaktor"
+msgstr "Csatorna-típusú, nagy energiakimenetű reaktor 1500 (RBMK-1500)"
msgid "stellarator"
msgstr "sztellarátor"
@@ -24839,10 +25017,10 @@ msgid "tokamak"
msgstr "tokamak"
msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
-msgstr "Vodo-Vodyanoi Energetichesky Reaktor (VVER)"
+msgstr "Víz-víz nyomottvizes energetikai reaktor (VVER)"
msgid "Solar Power Generator"
-msgstr "Napenergia alapú"
+msgstr "Napenergia-generátor"
msgctxt "generator method"
msgid "photovoltaic"
@@ -24853,19 +25031,19 @@ msgid "thermal"
msgstr "termál"
msgid "solar_photovoltaic_panel"
-msgstr "elektrovoltos napkollektor"
+msgstr "fotovoltaikus panel"
msgid "photovoltaic"
msgstr "fotovoltaikus"
msgid "solar_thermal_collector"
-msgstr "hőtároló napkollektor"
+msgstr "napkollektor"
msgid "thermal"
msgstr "termál"
msgid "Waste Power Generator"
-msgstr "Hulladékot hasznosító"
+msgstr "Hulladék-generátor"
msgctxt "generator method"
msgid "pyrolysis"
@@ -24879,15 +25057,15 @@ msgstr "Vízturbina"
msgctxt "generator method"
msgid "run-of-the-river"
-msgstr "folyami átfolyó"
+msgstr "folyami átfolyós"
msgctxt "generator method"
msgid "water-pumped-storage"
-msgstr "vízpumpás tároló"
+msgstr "vízpumpás tárolós"
msgctxt "generator method"
msgid "water-storage"
-msgstr "víztározó"
+msgstr "víztározós"
msgid "francis_turbine"
msgstr "Francis-turbina"
@@ -24911,7 +25089,7 @@ msgid "pelton_turbine"
msgstr "Pelton-turbina"
msgid "Tidal Water Turbine"
-msgstr "Árapály (Tidal) vízturbina"
+msgstr "Árapály-vízturbina"
msgctxt "generator method"
msgid "barrage"
@@ -24931,13 +25109,13 @@ msgid "vertical_axis"
msgstr "függőleges tengely"
msgid "Wave Energy Converter"
-msgstr "Hullámenergia átalakító"
+msgstr "Hullámenergia-átalakító"
msgid "Osmotic Power Generator"
-msgstr "Ozmózis elvén működő"
+msgstr "Ozmózisgenerátor"
msgid "Geothermal Power Generator"
-msgstr "Geotermikus"
+msgstr "Geotermikus generátor"
msgid "heat_pump"
msgstr "hőszivattyú"
@@ -24953,7 +25131,7 @@ msgstr "Alállomás típusa"
msgctxt "power"
msgid "transmission"
-msgstr "átvitel"
+msgstr "átvivő"
msgctxt "power"
msgid "distribution"
@@ -24973,7 +25151,7 @@ msgstr "kiegyenlítő"
msgctxt "power"
msgid "transition"
-msgstr "átmenet"
+msgstr "átmeneti"
msgctxt "power"
msgid "traction"
@@ -24984,7 +25162,7 @@ msgid "industrial"
msgstr "ipari"
msgid "Power rating (kVA/MVA)"
-msgstr "Feszültség fokozat (kVA/MVA)"
+msgstr "Feszültségfokozat (kVA/MVA)"
msgid "2700 kVA"
msgstr "2700 kVA"
@@ -25002,13 +25180,13 @@ msgid "100 MVA"
msgstr "100 MVA"
msgid "Gas insulated"
-msgstr "Gáz szigetelt"
+msgstr "Gázszigetelt"
msgid "Power Transformer"
msgstr "Transzformátor"
msgid "Type of transformer"
-msgstr "Transzformátor típus"
+msgstr "Transzformátor típusa"
msgctxt "power"
msgid "generator"
@@ -25036,8 +25214,8 @@ msgid ""
"(Please only use this tag if more detailed mapping using busbars and bays is "
"impossible!)"
msgstr ""
-"(Kérlek, csak akkor használd ezt a címkét, ha még részletesebb térképezésre -"
-" összekötősínekket és gyűjtőket használva - nincs lehetőség!)"
+"(Kérlek, csak akkor használd ezt a címkét, ha nincs lehetőség még "
+"részletesebb – összekötősíneket és gyűjtőket használó – térképezésre!)"
msgid "Power Busbar"
msgstr "Gyűjtősín"
@@ -25057,12 +25235,12 @@ msgstr "Átalakító típusa"
# LCC: Leaded Chip Carrier
msgctxt "power"
msgid "lcc"
-msgstr "Grafit CHIP hordozó (LCC)"
+msgstr "grafit CHIP hordozó (LCC)"
# voltage source converter (VSC).
msgctxt "power"
msgid "vsc"
-msgstr "Forrás feszültség konverter (VSC)"
+msgstr "forrásfeszültség-konverter (VSC)"
msgctxt "power"
msgid "back-to-back"
@@ -25100,11 +25278,11 @@ msgstr "statikus VA reaktor"
msgctxt "power"
msgid "statcom"
-msgstr "Statikus Szinkron Kompenzátor (STATCOM)"
+msgstr "statikus szinkron kompenzátor (STATCOM)"
msgctxt "power"
msgid "synchronous_condenser"
-msgstr "szinkron kondenzátor"
+msgstr "szinkronkondenzátor"
msgctxt "power"
msgid "filter"
@@ -25112,14 +25290,14 @@ msgstr "szűrő"
msgctxt "power"
msgid "series_reactor"
-msgstr "sorozat tekercs"
+msgstr "sorozattekercs"
msgctxt "power"
msgid "series_capacitor"
-msgstr "sorozat kondenzátor"
+msgstr "sorozatkondenzátor"
msgid "Power rating (kvar/Mvar)"
-msgstr "Feszültség kategória (kvar/Mvar)"
+msgstr "Feszültségkategória (kvar/Mvar)"
msgid "500 kvar"
msgstr "500 kvar"
@@ -25134,7 +25312,7 @@ msgid "Power Street Cabinet"
msgstr "Elosztószekrény"
msgid "Transformer Tower"
-msgstr "Trafótorony"
+msgstr "Transzformátortorony"
msgid "Power Portal"
msgstr ""
@@ -25174,11 +25352,11 @@ msgid "portal_three-level"
msgstr "három szintes portál"
msgid "Power Tower"
-msgstr "Nagyfeszültségű acéloszlop"
+msgstr "Távvezetékoszlop"
msgctxt "power"
msgid "Tower type"
-msgstr "Toronytípus"
+msgstr "Oszloptípus"
msgctxt "power"
msgid "suspension"
@@ -25205,7 +25383,7 @@ msgid "crossing"
msgstr "átkelés"
msgid "Branch tower type"
-msgstr "Elágaztató torony típus"
+msgstr "Elágaztatótorony-típus"
msgctxt "power"
msgid "tap"
@@ -25224,7 +25402,7 @@ msgid "cross"
msgstr "kereszt"
msgid "Tower design"
-msgstr "Torony kialakítás"
+msgstr "Torony kialakítása"
msgctxt "power"
msgid "one-level"
@@ -25248,7 +25426,7 @@ msgstr "henger"
msgctxt "power"
msgid "asymmetric"
-msgstr "asszimmetrikus"
+msgstr "aszimmetrikus"
msgctxt "power"
msgid "triangle"
@@ -25317,19 +25495,19 @@ msgid "Incomplete tower"
msgstr "Félkész torony"
msgid "Location transition"
-msgstr "Elhelyezkedés átvezetés"
+msgstr "Elhelyezkedés: átmenet"
msgid "Pole"
-msgstr "Villanypózna"
+msgstr "Villanyoszlop"
msgid "Pole with Transformer"
-msgstr "Oszloptranszformátor"
+msgstr "Villanyoszlop transzformátorral"
msgid "Pole Attributes:"
-msgstr "Pózna tulajdonságok:"
+msgstr "Villanyoszlop tulajdonságai:"
msgid "Transformer Attributes:"
-msgstr "Transzformátor jellemzők:"
+msgstr "Transzformátor tulajdonságai:"
msgid "Insulator"
msgstr "Szigetelő"
@@ -25341,10 +25519,10 @@ msgid "Line type"
msgstr "Vezeték típusa"
msgid "line"
-msgstr "fővonal (nagyfesz)"
+msgstr "fővonal (nagyfeszültség)"
msgid "minor_line"
-msgstr "mellékvonal (középfesz)"
+msgstr "mellékvonal (középfeszültség)"
msgid "Number of conductors/wires per cable"
msgstr "Vezetők/szálak száma a vezetékben"
@@ -25363,7 +25541,7 @@ msgstr "tripla"
msgctxt "power"
msgid "quad"
-msgstr "négyes"
+msgstr "négyszeres"
msgctxt "power"
msgid "fivefold"
@@ -25381,7 +25559,7 @@ msgid "Used for data communications"
msgstr "Adatkommunikációra használt"
msgid "Power Cable"
-msgstr "Kisfeszültségű szigetelt vezeték"
+msgstr "Szigetelt elektromos kábel"
msgctxt "power cable"
msgid "underground"
@@ -25405,13 +25583,13 @@ msgid "stately"
msgstr "kastély"
msgid "defensive"
-msgstr "vár"
+msgstr "(középkori) vár"
msgid "fortress"
-msgstr "erőd"
+msgstr "(újkori) erőd"
msgid "manor"
-msgstr "nemesi majorság"
+msgstr "kúria, udvarház"
msgid "palace"
msgstr "palota"
@@ -25432,16 +25610,16 @@ msgid "settlement"
msgstr "település"
msgid "necropolis"
-msgstr "temetkezőhely"
+msgstr "nekropolisz"
msgid "Battlefield"
-msgstr "Csatamező"
+msgstr "Csatatér"
msgid "Palaeontological Site"
msgstr "Őslénytani lelőhely"
msgid "Monument"
-msgstr "Kiemelkedően jelentős emlékmű"
+msgstr "Monumentális, épületszerű emlékmű"
msgid "Memorial"
msgstr "Emlékmű"
@@ -25460,15 +25638,15 @@ msgstr "emléktábla"
msgctxt "memorial"
msgid "stele"
-msgstr "sztélé"
+msgstr "kopjafa, sztélé"
msgctxt "memorial"
msgid "stone"
-msgstr "kő/szikla"
+msgstr "kő"
msgctxt "memorial"
msgid "war_memorial"
-msgstr "Háborús emlékmű"
+msgstr "háborús emlékmű"
msgid "Inscription"
msgstr "Felirat"
@@ -25484,7 +25662,7 @@ msgstr "Istentiszteleti hely"
msgctxt "building"
msgid "wayside_shrine"
-msgstr "Útmenti kegyhely"
+msgstr "útmenti kegyhely"
msgid "Boundary Stone"
msgstr "Határkő"
@@ -25499,7 +25677,7 @@ msgid "Supermarket"
msgstr "Szupermarket"
msgid "Convenience Store"
-msgstr "Kisbolt"
+msgstr "Kis élelmiszerbolt"
msgid "Kiosk"
msgstr "Trafik"
@@ -25511,28 +25689,28 @@ msgid "Butcher"
msgstr "Hentes"
msgid "Seafood"
-msgstr "Halárus"
+msgstr "Tengeri hal és más élőlény"
msgid "Dairy"
-msgstr ""
+msgstr "Tejtermékbolt"
msgid "Cheese"
-msgstr ""
+msgstr "Sajtbolt"
msgid "Deli (Fine Food)"
-msgstr "Delikatesz bolt"
+msgstr "Csemegebolt"
msgid "Pastry"
-msgstr "Cukrászsütemény"
+msgstr "Süteménybolt"
msgid "Confectionery"
-msgstr "Cukrászda"
+msgstr "Édességbolt"
msgid "Tea"
-msgstr "Tea"
+msgstr "Teabolt"
msgid "Coffee"
-msgstr "Kávé"
+msgstr "Kávébolt"
msgid "Public Market"
msgstr "Piac"
@@ -25544,16 +25722,16 @@ msgid "Greengrocer"
msgstr "Zöldséges"
msgid "Farm Stand"
-msgstr "Tanyasi pult"
+msgstr "Termelői stand"
msgid "Organic/Bio"
msgstr "Biobolt"
msgid "Fair Trade"
-msgstr "Méltányos Kereskedelem"
+msgstr "Fair Trade (méltányos kereskedelem)"
msgid "Alcohol"
-msgstr "Alkohol"
+msgstr "Szeszbolt"
msgid "Beverages"
msgstr "Italbolt"
@@ -25589,7 +25767,7 @@ msgid "Electronics"
msgstr "Elektronikai bolt"
msgid "Mobile Phone"
-msgstr "Mobiltelefon"
+msgstr "Mobiltelefon-szaküzlet"
msgid "Vacuum Cleaner"
msgstr "Porszívóbolt"
@@ -25598,28 +25776,28 @@ msgid "Hifi"
msgstr "Hi-fi bolt"
msgid "Video"
-msgstr "Videó"
+msgstr "Videofilmbolt vagy -kölcsönző"
msgid "Video Games"
-msgstr "Videójátékok"
+msgstr "Videojátékok"
msgid "Music"
-msgstr "Zene"
+msgstr "Hanglemezbolt"
msgid "Cash"
-msgstr "Fizetési lehetőség"
+msgstr "Készpénz"
msgid "Bank"
msgstr "Bank"
msgid "Automated Teller Machine"
-msgstr "Bankjegyautomata (ATM)"
+msgstr "Bankautomata (ATM)"
msgid "Money Exchange"
msgstr "Pénzváltó"
msgid "Pawnbroker"
-msgstr "Zálogkölcsönző"
+msgstr "Zálogház"
msgid "Home decoration"
msgstr "Lakberendezés"
@@ -25628,49 +25806,49 @@ msgid "Furniture"
msgstr "Bútorbolt"
msgid "Kitchen"
-msgstr "Konyhafelszerelés bolt"
+msgstr "Konyhafelszerelés-bolt"
msgid "Houseware"
-msgstr "Háztartás"
+msgstr "Háztartási bolt"
msgid "Curtain"
msgstr "Függönybolt"
msgid "Art"
-msgstr "Művészeti"
+msgstr "Művészeti bolt"
msgid "Frame"
-msgstr "Képkeret bolt"
+msgstr "Képkeretbolt"
msgid "Bed"
-msgstr "Ágy"
+msgstr "Hálószobafelszerelés-bolt"
msgid "Interior Decoration"
msgstr "Belső díszítés"
msgid "Antiques"
-msgstr "Régiségek"
+msgstr "Régiségbolt"
msgid "Printed Material"
msgstr "Nyomtatott cikkek"
msgid "Stationery"
-msgstr "Irodaszer bolt"
+msgstr "Papírbolt"
msgid "Copy Shop"
-msgstr "Másoló üzlet"
+msgstr "Fénymásoló"
msgid "Book Store"
msgstr "Könyvesbolt"
msgid "Newspaper Stand"
-msgstr "Újságárus bódé"
+msgstr "Újságárus (nem önálló épület)"
msgid "Ticket"
msgstr "Jegy"
msgid "For the body"
-msgstr "Szépségápolás"
+msgstr "Testápolás"
msgid "Chemist"
msgstr "Drogéria"
@@ -25679,13 +25857,13 @@ msgid "Cosmetics"
msgstr "Kozmetikum"
msgid "Perfumery"
-msgstr "Illatszer"
+msgstr "Illatszerbolt"
msgid "Beauty"
msgstr "Szépségszalon"
msgid "Tobacco"
-msgstr "Dohányáru"
+msgstr "Dohánybolt"
msgid "Hairdresser/Barber"
msgstr "Fodrász/Borbély"
@@ -25697,7 +25875,7 @@ msgid "Male"
msgstr "Férfi"
msgid "Unisex"
-msgstr "Uniszex"
+msgstr "Közös"
msgid "Tattoo"
msgstr "Tetoválószalon"
@@ -25706,7 +25884,7 @@ msgid "Optician"
msgstr "Optikus"
msgid "Hearing Aids"
-msgstr "Hallókészülék"
+msgstr "Hallókészülékbolt"
msgid "Medical Supply"
msgstr "Gyógyászati segédeszközök boltja"
@@ -25718,7 +25896,7 @@ msgid "Erotic"
msgstr "Szex shop"
msgid "Department Store"
-msgstr "Áruház"
+msgstr "Nagyáruház"
msgid "Mall"
msgstr "Bevásárlóközpont"
@@ -25757,16 +25935,16 @@ msgid "Bookmaker"
msgstr "Fogadóiroda"
msgid "Lottery"
-msgstr "Lottó"
+msgstr "Lottózó"
msgid "Bag"
-msgstr "Táska"
+msgstr "Táskabolt"
msgid "Pet"
-msgstr "Kisállat"
+msgstr "Kisállat-kereskedés"
msgid "Photo"
-msgstr "Fotó"
+msgstr "Fotósbolt"
msgid "Funeral Directors"
msgstr "Temetkezési vállalkozás"
@@ -25790,13 +25968,13 @@ msgid "cigarettes"
msgstr "cigaretta"
msgid "coffee"
-msgstr ""
+msgstr "kávé"
msgid "condoms"
msgstr "óvszer"
msgid "drinks"
-msgstr "italok"
+msgstr "ital"
msgid "elongated_coin"
msgstr "kinyújtott emlékérme"
@@ -25829,7 +26007,7 @@ msgid "public_transport_tickets"
msgstr "tömgeközlekedési jegy"
msgid "SIM_cards"
-msgstr "SIM_kártya"
+msgstr "SIM-kártya"
msgid "stamps"
msgstr "bélyeg"
@@ -25838,7 +26016,7 @@ msgid "sweets"
msgstr "édesség"
msgid "telephone_vouchers"
-msgstr "telefon utalványok"
+msgstr "telefonutalvány"
msgid "toys"
msgstr "játék"
@@ -25847,19 +26025,19 @@ msgid "Payment Methods"
msgstr "Fizetési módok"
msgid "Debit cards"
-msgstr "Bankkártya"
+msgstr "Betéti kártyák"
msgid "BankAxess"
-msgstr "BankAxess"
+msgstr "BankAxess (NO)"
msgid "Bancomat"
-msgstr "Bankomat"
+msgstr "Bancomat (IT)"
msgid "Girocard"
-msgstr "Bankkártya"
+msgstr "Girocard (DE)"
msgid "Laser"
-msgstr "Laser"
+msgstr "Laser (IE)"
msgid "Maestro"
msgstr "Maestro"
@@ -25871,7 +26049,7 @@ msgid "Visa Electron"
msgstr "Visa Electron"
msgid "Credit cards"
-msgstr "Hitelkártya"
+msgstr "Hitelkártyák"
msgid "American Express"
msgstr "American Express"
@@ -25880,7 +26058,7 @@ msgid "Diners Club"
msgstr "Diners Club"
msgid "Discover Card"
-msgstr "Discover kártya"
+msgstr "Discover Card"
msgid "JCB"
msgstr "JCB"
@@ -25895,43 +26073,43 @@ msgid "Electronic purses and Charge cards"
msgstr "Elektronikus vásárlás és feltöltőkártya"
msgid "Avant (fi)"
-msgstr "Avant (fi)"
+msgstr "Avant (FI)"
msgid "Cash (ch)"
-msgstr "Cash (ch)"
+msgstr "Cash (CH)"
msgid "Chipknip (nl)"
-msgstr "Chipknip (nl)"
+msgstr "Chipknip (NL)"
msgid "Geldkarte (de)"
-msgstr "Geldkarte (de)"
+msgstr "Geldkarte (DE)"
msgid "Mep (pt)"
-msgstr "Mep (pt)"
+msgstr "Mep (PT)"
msgid "Minicash (lu)"
-msgstr "Minicash (lu)"
+msgstr "Minicash (LU)"
msgid "Minipay (it)"
-msgstr "Minipay (it)"
+msgstr "Minipay (IT)"
msgid "Mondero (ar)"
-msgstr "Mondero (ar)"
+msgstr "Mondero (AR)"
msgid "Mondero 4b (es)"
-msgstr "Mondero 4b (es)"
+msgstr "Mondero 4b (ES)"
msgid "Moneo (fr)"
-msgstr "Moneo (fr)"
+msgstr "Moneo (FR)"
msgid "Proton (be)"
-msgstr "Proton (be)"
+msgstr "Proton (BE)"
msgid "Quick (au)"
-msgstr "Quick (au)"
+msgstr "Quick (AU)"
msgid "Cryptocurrencies"
-msgstr "Elektronikus pénztárca"
+msgstr "Kriptovaluták"
msgid "Bitcoin"
msgstr "Bitcoin"
@@ -25987,7 +26165,7 @@ msgstr "Alapítvány"
msgctxt "office"
msgid "Government"
-msgstr "Állami intézmény"
+msgstr "Kormányzat"
msgid "ministry"
msgstr "minisztérium"
@@ -25996,7 +26174,7 @@ msgid "prosecutor"
msgstr "ügyészség"
msgid "tax"
-msgstr "adóhatóság"
+msgstr "adóhivatal"
msgid "register_office"
msgstr "anyakönyvi hivatal"
@@ -26007,7 +26185,7 @@ msgstr "Biztosító"
msgctxt "office"
msgid "It specialist"
-msgstr "IT szakértő"
+msgstr "IT-szakértő"
msgctxt "office"
msgid "Lawyer"
@@ -26023,7 +26201,7 @@ msgstr "Civil szervezet"
msgctxt "office"
msgid "Notary"
-msgstr "Jegyzői iroda"
+msgstr "Közjegyző"
msgctxt "office"
msgid "Political party"
@@ -26031,11 +26209,11 @@ msgstr "Politikai párt"
msgctxt "office"
msgid "Religion"
-msgstr "Egyházi intézmény"
+msgstr "Egyház"
msgctxt "office"
msgid "Research"
-msgstr "Kutatás-fejlesztés"
+msgstr "Kutatás"
msgctxt "office"
msgid "Tax advisor"
@@ -26043,13 +26221,13 @@ msgstr "Adótanácsadó"
msgctxt "office"
msgid "Telecommunication"
-msgstr "Telekommunikáció"
+msgstr "Távközlési cég"
msgid "Craft"
-msgstr "Szakmák"
+msgstr "Műhely"
msgid "Beekeeper"
-msgstr "Méhészet"
+msgstr "Méhész"
msgid "Brewery"
msgstr "Sörfőzde"
@@ -26076,19 +26254,19 @@ msgid "Plumber"
msgstr "Vízvezeték-szerelő"
msgid "Hvac"
-msgstr "Épületgépészet"
+msgstr "Fűtés-, szellőztetés- és légkondicionálás-szerelő"
msgid "Painter"
msgstr "Szobafestő-mázoló"
msgid "Tiler"
-msgstr "Hidegburkoló"
+msgstr "Burkoló"
msgid "Window construction"
-msgstr "Nyílászáró gyártás"
+msgstr "Ablakkészítő"
msgid "Carpenter"
-msgstr "Ács, asztalos"
+msgstr "Ács"
msgid "Roofer"
msgstr "Tetőfedő"
@@ -26106,7 +26284,7 @@ msgid "Gardener"
msgstr "Kertész"
msgid "Shoemaker"
-msgstr "Cipész, suszter"
+msgstr "Cipész"
msgid "Sawmill"
msgstr "Fűrészmalom"
@@ -26115,10 +26293,10 @@ msgid "Stonemason"
msgstr "Kőfaragó"
msgid "Blacksmith"
-msgstr "Kovácsműhely"
+msgstr "Kovács"
msgid "Metal construction"
-msgstr "Fém megmunkálás"
+msgstr "Fémiparos"
msgid "Geography"
msgstr "Földrajz"
@@ -26142,10 +26320,10 @@ msgid "Division"
msgstr "Közigazgatási egység"
msgid "canton"
-msgstr "Kanton"
+msgstr "kanton"
msgid "linguistic_community"
-msgstr "Nyelvi közösség"
+msgstr "nyelvi közösség"
msgid "ward"
msgstr "ward"
@@ -26212,10 +26390,10 @@ msgid "Isolated Dwelling"
msgstr "Különálló lakhely"
msgid "Suburb"
-msgstr "Településrész"
+msgstr "Jelentős városrész"
msgid "Neighbourhood"
-msgstr "Telep"
+msgstr "Környék"
msgid "Farm"
msgstr "Tanya"
@@ -26227,19 +26405,19 @@ msgid "(please use isolated_dwelling for an isolated farm)"
msgstr "(kérlek használd az isolated_dwelling címkét a különálló tanyáért)"
msgid "Locality"
-msgstr "Lakosság nélküli hely"
+msgstr "Lakatlan hely, dűlő"
msgid "Peak"
msgstr "Csúcs"
msgid "The top (summit) of a mountain or hill."
-msgstr "Hegy vagy a dombtető (csúcs)."
+msgstr "Hegy- vagy a dombtető (csúcs)."
msgid "Saddle"
msgstr "Nyereg"
msgid "A saddle point between mountains or hills."
-msgstr "Egy nyereg a hegyek vagy dombok közt."
+msgstr "Hegyek vagy dombok közötti nyeregpont."
msgid "Glacier"
msgstr "Gleccser"
@@ -26253,10 +26431,10 @@ msgid "Volcano"
msgstr "Vulkán"
msgid "A volcano, either dormant, extinct or active."
-msgstr "Egy vulkán, akár alvó, kialudt vagy aktív."
+msgstr "Alvó, kialudt vagy aktív tűzhányó."
msgid "Current Status"
-msgstr "Aktuális állapot"
+msgstr "Jelenlegi állapot"
msgid "dormant"
msgstr "alvó"
@@ -26274,16 +26452,16 @@ msgid "scoria"
msgstr "salak"
msgid "Ridge"
-msgstr "Gerinc"
+msgstr "Hegygerinc"
msgid "A mountain or hill ridge."
-msgstr "Egy domb- vagy hegygerinc."
+msgstr "Domb- vagy hegygerinc."
msgid "Valley"
msgstr "Völgy"
msgid "A low area between hills."
-msgstr "Egy alacsonyan fekvő terület a hegyek között."
+msgstr "Alacsonyan fekvő terület a hegyek között."
msgid "Cliff"
msgstr "Szirt"
@@ -26344,7 +26522,7 @@ msgid "Forest"
msgstr "Ültetett erdő"
msgid "Cutline"
-msgstr "Irtás"
+msgstr "Nyiladék"
msgctxt "cutline"
msgid "border"
@@ -26420,7 +26598,7 @@ msgstr ""
"folyómederben."
msgid "Fell"
-msgstr "Kopár hegyoldal"
+msgstr "Fjell"
msgid ""
"Bare upper lying uncultivated land principally covered with grass and often "
@@ -26430,7 +26608,7 @@ msgstr ""
"legelő is."
msgid "Scrub"
-msgstr "Cserjés"
+msgstr "Bozót"
msgid ""
"Bare lower lying uncultivated land with bushes but little or no tree cover."
@@ -26439,7 +26617,7 @@ msgstr ""
"éppen fa nélkül."
msgid "Heath"
-msgstr "Hangafüves rét"
+msgstr "Fenyér"
msgid ""
"Bare lower lying uncultivated land with a shrubland habitat found mainly on "
@@ -26477,7 +26655,7 @@ msgstr ""
"alapkőzethez."
msgid "Tourism attraction"
-msgstr "Turistalátványosság"
+msgstr "Turisztikai látványosság"
msgid "Stone"
msgstr "Kő"
@@ -26499,7 +26677,7 @@ msgid "Farmland"
msgstr "Mezőgazdasági terület"
msgid "Crop"
-msgstr "Termés"
+msgstr "Termény"
msgctxt "crop"
msgid "corn"
@@ -26522,7 +26700,7 @@ msgid "hop"
msgstr "komló"
msgid "Meadow"
-msgstr "Mező"
+msgstr "Rét"
msgid "Orchard"
msgstr "Gyümölcsös"
@@ -26558,7 +26736,7 @@ msgid "cherry_trees"
msgstr "cseresznyefa"
msgid "persimmon_trees"
-msgstr "datolyaszilva"
+msgstr "datolyaszilvafa"
msgid "walnut_trees"
msgstr "diófa"
@@ -26576,10 +26754,10 @@ msgid "Vineyard"
msgstr "Szőlőültetvény"
msgid "Greenhouse Horticulture"
-msgstr "Melegház"
+msgstr "Üvegházi kertészet"
msgid "Plant Nursery"
-msgstr "Növény nevelde"
+msgstr "Faiskola"
msgid "Aquaculture"
msgstr "Akvakultúra"
@@ -26591,43 +26769,43 @@ msgid "mussels"
msgstr "kagyló"
msgid "Allotments"
-msgstr "Telkek"
+msgstr "Kiskertek"
msgid "Garden"
-msgstr "Díszkert"
+msgstr "Kert"
msgid "Grass"
msgstr "Fű"
msgid "Village Green"
-msgstr "Közös mező"
+msgstr "Faluközponti zöldterület (Anglia & Wales)"
msgid "Common"
-msgstr "Közös"
+msgstr "Faluközponti zöldterület (Anglia & Wales)"
msgid "Park"
msgstr "Park"
msgid "Recreation Ground"
-msgstr "Szabadidő park"
+msgstr "Szabadidőpark"
msgid "Residential Area"
msgstr "Lakóterület"
msgid "Graveyard"
-msgstr "Sírkert"
+msgstr "Templom körüli temető"
msgid "Cemetery"
msgstr "Temető"
msgid "Religious"
-msgstr "Vallási"
+msgstr "Vallási terület"
msgid "Retail"
-msgstr "Kereskedelmi"
+msgstr "Kiskereskedelmi terület"
msgid "Commercial"
-msgstr "Irodák"
+msgstr "Üzleti terület"
msgid "Industrial"
msgstr "Iparterület"
@@ -26639,7 +26817,7 @@ msgid "Railway Land"
msgstr "Vasúti terület"
msgid "Military"
-msgstr "Katonai"
+msgstr "Katonai terület"
msgid "Construction Area"
msgstr "Építési terület"
@@ -26657,7 +26835,7 @@ msgid "Quarry"
msgstr "Kőfejtő"
msgid "Annotation"
-msgstr "Annotáció"
+msgstr "Megjegyzés"
msgid "Alternative name"
msgstr "Alternatív név"
@@ -26666,7 +26844,7 @@ msgid "Historical name"
msgstr "Történelmi név"
msgid "Local name"
-msgstr "Helyi elnevezés"
+msgstr "Helyi név"
msgid "Regional name"
msgstr "Regionális név"
@@ -26681,10 +26859,10 @@ msgid "Official name"
msgstr "Hivatalos név"
msgid "Common name abbreviation"
-msgstr "Közismert név rövidítés"
+msgstr "Közismert név rövidítése"
msgid "Address"
-msgstr "Lakcím"
+msgstr "Cím"
msgid "House number"
msgstr "Házszám"
@@ -26898,13 +27076,13 @@ msgid "even"
msgstr "páros"
msgid "alphabetic"
-msgstr "ábécé"
+msgstr "ábécésorrend"
msgid "Accuracy"
msgstr "Pontosság"
msgid "actual"
-msgstr "aktuális"
+msgstr "tényleges"
msgid "estimate"
msgstr "becsült"
@@ -26916,7 +27094,7 @@ msgid "Contact (Common Schema)"
msgstr "Kapcsolat (Általános séma)"
msgid "Email Address"
-msgstr "Emailcím"
+msgstr "E-mail cím"
msgid "Fax Number"
msgstr "Faxszám"
@@ -26929,7 +27107,7 @@ msgstr "Kapcsolat („contact:*” előtagú séma)"
msgctxt "description=*"
msgid "A short text with additional information."
-msgstr "Egy rövid szöveg további információkkal."
+msgstr "Rövid szöveg további információkkal."
msgctxt "description=*"
msgid ""
@@ -26950,8 +27128,7 @@ msgstr "Megjegyzés"
msgctxt "note=*"
msgid "An important hint for other mappers (not for the end user)."
msgstr ""
-"Egy fontos megjegyzés a többi térképszerkesztő számára (nem a "
-"felhasználóknak)."
+"Fontos megjegyzés a többi térképszerkesztőnek (nem a felhasználónak)."
msgid "Fixme"
msgstr "Fixme"
@@ -26961,8 +27138,8 @@ msgid ""
"A hint for other mappers (not for the end user), that an object needs an "
"improvement."
msgstr ""
-"Egy megjegyzés a többi térképszerkesztő számára (nem a felhasználóknak) "
-"arról, hogy az objektumon javítanivaló van."
+"Megjegyzés a többi térképszerkesztőnek (nem a felhasználónak) arról, hogy az "
+"objektumon javítanivaló van."
msgid "outer segment"
msgstr "külső szakasz"
@@ -26983,40 +27160,40 @@ msgid "maritime"
msgstr "tengeri"
msgid "national_park"
-msgstr "nemzeti_park"
+msgstr "nemzeti park"
msgid "political"
msgstr "politikai"
msgid "postal_code"
-msgstr "postai_irányítószám"
+msgstr "irányítószám"
msgid "protected_area"
-msgstr "védett_övezet"
+msgstr "védett terület"
msgid "Sub area"
msgstr "Alterület"
msgid "Administration centre"
-msgstr "Adminisztratív központ"
+msgstr "Közigazgatási központ"
msgid "Label point"
msgstr "Felirat pontja"
msgid "Outline of building"
-msgstr ""
+msgstr "Épület körvonala"
msgid "Inner segment"
-msgstr ""
+msgstr "Belső szakasz"
msgid "Roof ridge"
-msgstr ""
+msgstr "Tető gerince"
msgid "Roof edge"
-msgstr ""
+msgstr "Tető széle"
msgid "Building level"
-msgstr ""
+msgstr "Épület szintje"
msgid "Site"
msgstr "Hely"
@@ -27037,31 +27214,31 @@ msgid "members of site"
msgstr "a hely tagjai"
msgid "Turn Restriction"
-msgstr "Kanyarodási korlátozás"
+msgstr "Bekanyarodási korlátozás"
msgid "Restriction"
msgstr "Korlátozás"
msgid "no_left_turn"
-msgstr "tilos balra kanyarodni"
+msgstr "balra bekanyarodni tilos"
msgid "no_right_turn"
-msgstr "tilos jobbra kanyarodni"
+msgstr "jobbra bekanyarodni tilos"
msgid "no_straight_on"
-msgstr "tilos egyenesen haladni"
+msgstr "egyenesen továbbhaladni tilos"
msgid "no_u_turn"
-msgstr "tilos megfordulni"
+msgstr "megfordulni tilos"
msgid "only_right_turn"
-msgstr "csak jobbra kanyarodás"
+msgstr "kötelező irány: jobbra"
msgid "only_left_turn"
-msgstr "csak balra kanyarodás"
+msgstr "kötelező irány: balra"
msgid "only_straight_on"
-msgstr "csak egyenesen haladás"
+msgstr "kötelező irány: egyenesen"
msgid "from way"
msgstr "vonalról"
@@ -27073,25 +27250,25 @@ msgid "to way"
msgstr "vonalra"
msgid "Enforcement"
-msgstr "Kényszerítő eszköz"
+msgstr "Forgalomellenőrzés"
msgid "Type of enforcement"
-msgstr "Kényszerítés típusa"
+msgstr "Forgalomellenőrzés típusa"
msgid "maxheight"
-msgstr "max magasság"
+msgstr "magasságkorlátozás"
msgid "maxweight"
-msgstr "max súly"
+msgstr "súlykorlátozás"
msgid "maxspeed"
-msgstr "max sebesség"
+msgstr "sebességkorlátozás"
msgid "mindistance"
-msgstr "min távolság"
+msgstr "követési távolság"
msgid "check"
-msgstr "ellenőrzés"
+msgstr "ellenőrzőhely"
msgid "Max. height (meters, only if enforcement=maxheight)"
msgstr "Magasságkorlátozás (méter, csak ha enforcement=maxheight)"
@@ -27103,31 +27280,31 @@ msgid "Max. speed (km/h, only if enforcement=maxspeed)"
msgstr "Sebességkorlátozás (km/h, csak ha enforcement=maxspeed)"
msgid "location of enforcement device"
-msgstr "kényszerítő eszköz helye"
+msgstr "forgalomellenőrző berendezés elhelyezkedése"
msgid "node on way where enforcement starts"
-msgstr "pont az úton, ahol a kényszerítés kezdődik"
+msgstr "pont a vonalon ott, ahol a forgalomellenőrzés kezdődik"
msgid "where enforcement ends"
-msgstr "ahol a kényszerítés véget ér"
+msgstr "ahol a forgalomellenőrzés véget ér"
msgid "traffic light or barrier that stops you"
-msgstr "jelzőlámpa, vagy akadály, ami megállít"
+msgstr "jelzőlámpa vagy akadály, amely megállít"
msgid "Routes"
msgstr "Útvonalak"
msgid "Bicycle Route"
-msgstr "Kerékpár útvonal"
+msgstr "Kerékpáros útvonal"
msgid "national"
-msgstr "nemzeti"
+msgstr "országos"
msgid "local"
msgstr "helyi"
msgid "Mountain Biking Route"
-msgstr "Hegyikerékpár útvonal"
+msgstr "Hegyikerékpáros útvonal"
msgid "Hiking Route"
msgstr "Túraútvonal"
@@ -27136,22 +27313,22 @@ msgid "infrastructure"
msgstr "infrastruktúra"
msgid "natural"
-msgstr "természet"
+msgstr "természetes"
msgid "Walking Route"
-msgstr "Gyalogló útvonal"
+msgstr "Gyalogos útvonal"
msgid "Riding Route"
-msgstr "Lovagló útvonal"
+msgstr "Lovas útvonal"
msgid "Piste Route"
-msgstr "Sí útvonal"
+msgstr "Havas útvonal"
msgid "link segment"
msgstr "hivatkozásszegmens"
msgid "shortcut segment"
-msgstr "billentyűparancs szegmens"
+msgstr "billentyűparancs-szegmens"
msgid "variant segment"
msgstr "változó szegmens"
@@ -27160,37 +27337,37 @@ msgid "entry points"
msgstr "belépési pontok"
msgid "Ski Route"
-msgstr "Síelési útvonal"
+msgstr "Sífutó-útvonal"
msgid "alpine"
-msgstr "hegyi"
+msgstr "alpesi"
msgid "Detour Route"
msgstr "Kerülőút"
msgid "Ref of the way this is a detour to"
-msgstr "Az út azonosítója, aminek ez kerülője"
+msgstr "Azon út azonosítója, amelynek ez kerülője"
msgid "fork node for alternative routes"
msgstr "elágazási pont alternatív útvonalakhoz"
msgid "Power Route"
-msgstr "Távvezeték útvonal"
+msgstr "Távvezeték nyomvonala"
msgid "Railway Route"
-msgstr "Vasúti Útvonal"
+msgstr "Vasútvonal"
msgid "Road Route"
-msgstr "Közúti Útvonal"
+msgstr "Közúti útvonal"
msgid "Route Network"
-msgstr "Útvonal Hálózat"
+msgstr "Útvonalhálózat"
msgid "member"
msgstr "tag"
msgid "Associated Street"
-msgstr "Kapcsolódó Utca"
+msgstr "Kapcsolódó utca"
msgid "house"
msgstr "ház"
@@ -27214,7 +27391,7 @@ msgid "Destination Sign"
msgstr "Útirányjelző tábla"
msgid "Destination written on sign (w/o distance)"
-msgstr "A táblán jelzett célpont (táv nélkül)"
+msgstr "A táblán jelzett útirány (távolság nélkül)"
msgid "Time (hh:mm, for trekking)"
msgstr "Idő (óó:pp, túrázáshoz)"
@@ -27229,16 +27406,16 @@ msgid "Colour of border/arrow"
msgstr "Keret/nyíl színe"
msgid "last way before junction"
-msgstr "utolsó vonal a kereszteződés előtt"
+msgstr "kereszteződés előtti utolsó vonal"
msgid "node of the intersection"
msgstr "kereszteződés pontja"
msgid "first way after junction"
-msgstr "első vonal a kereszteződés után"
+msgstr "kereszteződés utáni első vonal"
msgid "position of sign"
-msgstr "a tábla helye"
+msgstr "tábla helye"
msgid "Waterway"
msgstr "Vízfelület"
@@ -27250,34 +27427,34 @@ msgid "stream"
msgstr "patak"
msgid "drain"
-msgstr "száraz"
+msgstr "vízlevezető csatorna"
msgid "ditch"
msgstr "árok"
msgid "Name of river/lake/sea/ocean it runs into"
-msgstr "A folyó/tó/tenger/óceán neve, ahova belefolyik"
+msgstr "A folyó/tó/tenger/óceán neve, amelybe beleömlik"
msgid "Reference Sandre (FR)"
-msgstr "Sandre azonosító (FR)"
+msgstr "Sandre-azonosító (FR)"
msgid "Reference FGKZ (DE)"
-msgstr "FGKZ azonosító (DE)"
+msgstr "FGKZ-azonosító (DE)"
msgid "Reference REGINE (NO)"
-msgstr "REGINE azonosító (NO)"
+msgstr "REGINE-azonosító (NO)"
msgid "Reference GNIS (USA)"
-msgstr "GNIS azonosító (USA)"
+msgstr "GNIS-azonosító (USA)"
msgid "Reference GNBC (CA)"
-msgstr "GNBC azonosító (CA)"
+msgstr "GNBC-azonosító (CA)"
msgid "waterways (no riverbank)"
-msgstr "waterways (no riverbank)"
+msgstr "vízfolyás (nem a part)"
msgid "branch waterways (no riverbank)"
-msgstr "vízfolyás ág (nem a part)"
+msgstr "folyóág (nem a part)"
msgid "spring of waterway"
msgstr "vízfolyás forrása"
@@ -27286,10 +27463,10 @@ msgid "Length (meters)"
msgstr "Hossz (méter)"
msgid "ways supported by (on top of) the bridge"
-msgstr "Hídon átmenő vonalak"
+msgstr "a híd által alátámasztott (rajta lévő) vonalak"
msgid "ways passing under the bridge"
-msgstr "Híd alatt átmenő vonalak"
+msgstr "a híd alatt átmenő vonalak"
msgid "way forming the outline footprint"
msgstr "a körvonalat formázó vonal"
@@ -27334,7 +27511,7 @@ msgid "View URL"
msgstr "URL megtekintése"
msgid "Send Email"
-msgstr "Email küldése"
+msgstr "E-mail küldése"
msgid "View image"
msgstr "Kép megtekintése"
@@ -27343,102 +27520,102 @@ msgid "View %name% article"
msgstr "%name% szócikk megtekintése"
msgid "View Wikidata page"
-msgstr "Wikipédia oldal megtekintése"
+msgstr "Wikipédia-oldal megtekintése"
msgid "View Wikispecies page"
-msgstr ""
+msgstr "Wikispecies-oldal megtekintése"
msgid "View UNESCO sheet"
-msgstr ""
+msgstr "UNESCO-adatlap megtekintése"
msgid "View %name% image"
-msgstr ""
+msgstr "%name% kép megtekintése"
msgid "View %name% sheet of river"
-msgstr ""
+msgstr "%name% folyóadatlap megtekintése"
msgid "View %name% municipality sheet"
-msgstr ""
+msgstr "%name% települési adatlap megtekintése"
msgid "View %name% sheet on osm.fr"
-msgstr ""
+msgstr "%name% adatlap megtekintése az osm.fr oldalon"
msgid "View %name% map of municipalities"
-msgstr ""
+msgstr "%name% településtérkép megtekintése"
msgid "View %name% list of municipalities"
-msgstr ""
+msgstr "%name% településlista megtekintése"
msgid "View %name% map of cantons"
-msgstr ""
+msgstr "%name% kantontérkép megtekintése"
msgid "View %name% list of cantons"
-msgstr ""
+msgstr "%name% kantonlista megtekintése"
msgid "View %name% map of arrondissements"
-msgstr ""
+msgstr "%name% körzettérkép (arrondissement) megtekintése"
msgid "View %name% list of arrondissements"
-msgstr ""
+msgstr "%name% körzetlista (arrondissement) megtekintése"
msgid "View %name% map of departments"
-msgstr ""
+msgstr "%name% körzettérkép (department) megtekintése"
msgid "View %name% list of departments"
-msgstr ""
+msgstr "%name% körzetlista (department) megtekintése"
msgid "View %name% map of regions"
-msgstr ""
+msgstr "%name% régiótérkép megtekintése"
msgid "View %name% list of regions"
-msgstr ""
+msgstr "%name% régiólista megtekintése"
msgid "View %name% sheet of church"
-msgstr ""
+msgstr "%name% templomadatlap megtekintése"
msgid "View Mérimée sheet of monument"
msgstr "Emlékmű Mérimée-adatlapjának megtekintése (FR)"
msgid "View Mérimée list for this municipality"
-msgstr ""
+msgstr "A település Mérimée-listájának megtekintése (FR)"
msgid "View %name% sheet of geodesic site"
-msgstr ""
+msgstr "%name% földmérési pont adatlapjának megtekintése (FR)"
msgid "View UAI sheet of school/college"
-msgstr ""
+msgstr "Iskola UAI-adatlapjának megtekintése (FR)"
msgid "View %name% sheet of hospital/home"
-msgstr ""
+msgstr "%name% kórház/otthon adatlapjának megtekintése"
msgid "View INSEE explanation of %name% code"
-msgstr ""
+msgstr "A(z) %name%-kód INSEE általi magyarázatának megtekintése (FR)"
msgid "Get identification card (pdf) for this establishment"
-msgstr ""
+msgstr "A létesítmény azonosító lapjának letöltése (PDF)"
msgid "View %name% page of this post office"
-msgstr ""
+msgstr "A posta %name%-oldalának megtekintése"
msgid "View %name% sheet of memorial"
-msgstr ""
+msgstr "Az emlékmű %name%-adatlapjának megtekintése"
msgid "Even housenumber in odd address interpolation."
-msgstr "Páros házszám a páratlan oldali lakcím interpolációban."
+msgstr "Páros házszám a páratlan oldali lakcím-interpolációban."
msgid "Odd housenumber in even address interpolation."
-msgstr "Páratlan házszám a páros oldali lakcím interpolációban."
+msgstr "Páratlan házszám a páros oldali lakcím-interpolációban."
msgid "Way with {0}. Tag each housenumber separately if possible."
msgstr ""
-"Vonal {0} címkével. Ha lehetséges, címkézd külön az egyes házszámokat."
+"Vonal a következővel: {0}. Ha lehetséges, külön címkézd az egyes házszámokat."
msgid ""
"Object has no {0}, however, it has {1} and {2} whose value looks like a "
"housenumber."
msgstr ""
-"Az objektumnak nincs {0} címkéje, pedig van {1} és {2}, aminek értéke "
-"házszámnak néz ki."
+"Az objektumnak nincs {0} címkéje, pedig van {1} és {2}, amelyek értéke "
+"házszámnak tűnik."
msgid "Same value of {0} and {1}"
msgstr "{0} és {1} értéke ugyanaz"
@@ -27447,19 +27624,19 @@ msgid "{0} without {1}"
msgstr "{0} {1} nélkül"
msgid "missing tag"
-msgstr ""
+msgstr "hiányzó címke"
msgid "{0} without {1} or {2}"
-msgstr "{0} {1} vagy {2} nélkül"
+msgstr "{1} vagy {2} nélküli {0}"
msgid "{0} without {1}, {2} or {3}"
-msgstr "{0} {1}, {2} vagy {3} nélkül"
+msgstr "{1}, {2} vagy {3} nélküli {0}"
msgid "{0} together with {1}"
-msgstr "{0} együtt {1}-el"
+msgstr "{0} együtt van a következővel: {1}"
msgid "suspicious tag combination"
-msgstr ""
+msgstr "gyanús címkekombináció"
msgid "two objects, one with {0} and one with {1} + {2} + {3}"
msgstr "két objektum, egy {0} és egy {1} + {2} + {3}"
@@ -27471,10 +27648,10 @@ msgid "incomplete object: only {0} and {1}"
msgstr "befejezetlen objektum: csak {0} és {1}"
msgid "{0} together with addr:*"
-msgstr "{0} addr:* címkével együtt"
+msgstr "addr:* címkével együtt használt {0}"
msgid "{0} together with {1} and conflicting values"
-msgstr "{0}, {1} címkével együtt és ellentmondó az értékük"
+msgstr "{0} együtt van {1} címkével együtt, és ellentmondó az értékük"
msgid "{0} on suspicious object"
msgstr "{0} gyanús objektumon"
@@ -27486,7 +27663,7 @@ msgid "sport without physical feature"
msgstr "sport fizikai tulajdonság nélkül"
msgid "alternative name without {0}"
-msgstr "alternatív név, {0} nélkül"
+msgstr "alternatív név {0} nélkül"
msgid "incomplete usage of {0} on a way without {1}"
msgstr "a(z) {0} bejezetlen használata egy vonalon {1} nélkül"
@@ -27495,7 +27672,8 @@ msgid "Same value of {0}, {1} and {2}"
msgstr "{0}, {1} és {2} értéke ugyanaz"
msgid "{0} and {1} together with {2} and conflicting values"
-msgstr "{0}, {1} és {2} értéke ugyanaz és ellentmondó az értékük"
+msgstr ""
+"{0} és {1} együtt szerepel a következővel: {2}, és ellentmondó az értékük"
msgid "{0} on a relation without {1}"
msgstr "{0} egy kapcsolaton {1} nélkül"
@@ -27527,7 +27705,7 @@ msgid "Different number of lanes in the keys {0} and {1}"
msgstr "Sávok száma eltér {0} és {1} kulcsokban"
msgid "possibly missing {0} tag"
-msgstr ""
+msgstr "hiányozhat a következő címke: {0}"
msgid "street with odd number of {0}, but without {1} and {2} or {3}"
msgstr ""
@@ -27536,26 +27714,25 @@ msgid "{0} is deprecated"
msgstr "{0} elavult"
msgid "deprecated tagging"
-msgstr ""
+msgstr "elavult címkézés"
msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
msgstr ""
-"A(z) ''{0}'' semmitmondó, használj még specifikusabb címkéket, például "
-"''{1}''"
+"A(z) ''{0}'' semmitmondó, használj konkrétabb címkéket, például ''{1}''"
msgid ""
"''{0}'' does not specify the official mode of transportation, use ''{1}'' "
"for example"
msgstr ""
-"A(z) ''{0}'' nem határozza meg a szállítmányozás hivatalos módját, használd "
-"a(z) ''{1}''-t például"
+"A(z) ''{0}'' nem határozza meg a hivatalos közlekedési módot, használd a(z) "
+"''{1}''-t például"
msgid ""
"{0}={1} is unspecific. Instead of ''{1}'' please give more information about "
"what exactly should be fixed."
msgstr ""
-"{0}={1} értelmetlen. Kérlek, a(z) ''{1}'' helyett inkább azt az információt "
-"add meg, hogy pontosan mit kellene még kijavítani!"
+"{0}={1} nem konkrét. Kérlek, a(z) ''{1}'' helyett inkább adj több "
+"tájékoztatást arról, hogy pontosan mit is kellene kijavítani!"
msgid ""
"Wrong usage of {0} tag. Remove {1}, because it is clear that the name is "
@@ -27568,27 +27745,28 @@ msgid ""
"{0} is unspecific. Instead use the key fixme with the information what "
"exactly should be fixed in the value of fixme."
msgstr ""
-"{0} címke nem meghatározott. Helyette használd a fixme kulcsot az értékében "
-"leírva, hogy pontosan mit kéne javítani."
+"{0} címke nem konkrét. Helyette használd inkább a fixme kulcsot, és az "
+"értékmezőben írd le, hogy pontosan mit kellene kijavítani."
msgid "{0} is deprecated. Please use instead a multipolygon."
-msgstr "A(z) {0} kivezetésre került. Kérlek, használj inkább multipoligont."
+msgstr "A(z) {0} elavult. Kérlek, használj inkább multipoligont."
msgid ""
"{0} is deprecated. Please specify interval by using opening_hours syntax"
msgstr ""
-"A(z) {0} kivezetésre került. Kérlek, az intervallumot az opening_hours címke "
-"szintaxisa szerint add meg"
+"A(z) {0} elavult. Kérlek, az intervallumot az opening_hours címke szintaxisa "
+"szerint add meg"
msgid ""
"{0} is deprecated. Please delete this object and use a private layer instead"
msgstr ""
-"A(z) {0} kivezetésre került. Kérlek, töröld ezt az objektumot és használj "
-"helyette privát réteget"
+"A(z) {0} elavult. Kérlek, töröld ezt az objektumot és használj helyette "
+"privát réteget"
msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
msgstr ""
-"A(z)z {0}={1} semmitmondó. Kérlek, helyettesítsd ''{1}''-et konkrét értékkel."
+"A(z)z {0}={1} nem konkrét. Kérlek, helyettesítsd konkrét értékkel a "
+"következőt: ''{1}''"
msgid "{0} should be replaced with {1}"
msgstr "a(z) {0}-t {1}-el kellene cserélni"
@@ -27600,11 +27778,11 @@ msgid ""
"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
"''both''."
msgstr ""
-"{0}={1} semmitmondó. Kérlek, cseréld a(z) ''{1}''-et valamelyikkel ''left'', "
-"''right'' vagy ''both''."
+"{0}={1} nem konkrét. Kérlek, cseréld a(z) ''{1}''-at/-et/-öt valamelyikkel: "
+"''left'', ''right'' vagy ''both''."
msgid "Unspecific tag {0}"
-msgstr "Meghatározatlan címke {0}"
+msgstr "Nem konkrét címke: {0}"
msgid "Definition of {0} is unclear"
msgstr "{0} definíciója nem világos"
@@ -27751,13 +27929,15 @@ msgid "highway without a reference"
msgstr "közút útszám nélkül"
msgid "Unspecific highway type"
-msgstr ""
+msgstr "Nem konkrét úttípus"
msgid "{0} used with {1}"
msgstr "{0} együtt használva {1}-el"
msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
msgstr ""
+"{0} elavult, használd inkább a következőt: {1}. Ellenőrizd a hasonló "
+"címkéket is, mint például: {2}"
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
@@ -27818,7 +27998,7 @@ msgstr ""
"nélkül"
msgid "unusual {0} specification"
-msgstr "furcsa {0} meghatározás"
+msgstr "{0} meghatározása szokatlan"
msgid "unusual train track gauge; use mm with no separator"
msgstr "szokatlan vonatsín-nyomtáv; használj mm-t elválasztó nélkül"
@@ -27837,10 +28017,10 @@ msgid "unusual value of {0}"
msgstr "{0} értéke szokatlan"
msgid "{0} must be a numeric value, in meters and without units"
-msgstr ""
+msgstr "A(z) {0}-nak/-nek számnak kell lennie, méterben, mértékegység nélkül"
msgid "relation without type"
-msgstr "kapcsolat típus nélkül"
+msgstr "típus nélküli kapcsolat"
msgid "{0} relation without {0} tag"
msgstr "{0} kapcsolat {0} cimke nélkül"
@@ -27861,42 +28041,46 @@ msgid "street name contains ss"
msgstr "az utcanév ss-t tartalmaz"
msgid "street name contains ß"
-msgstr ""
+msgstr "az utcanév ß-t tartalmaz"
msgid "{0} is unnecessary"
-msgstr "{0} szükségtelen"
+msgstr "{0} fölösleges"
msgid "unnecessary tag"
-msgstr ""
+msgstr "fölösleges címke"
msgid "{0} is unnecessary for {1}"
-msgstr "{0} szükségtelen a(z) {1} részére"
+msgstr "{0} fölösleges ehhez: {1}"
msgid "{0} makes no sense"
-msgstr ""
+msgstr "semmi értelme a következőnek: {0}"
msgid "Nodes duplicating parent way tags"
-msgstr "Pont duplikálja a szülővonal címkéit"
+msgstr "A pontok megismétlik a szülővonal címkéit"
msgid ""
"wikipedia tag has no language given, use ''wikipedia''=''language:page "
"title''"
msgstr ""
+"a wikipedia címkéhez nincs nyelv megadva, használd a "
+"\"wikipedia\"=\"nyelv:oldal címe\" szintaxist"
msgid "wikipedia tag has an unknown language prefix"
-msgstr ""
+msgstr "a wikipedia címkében ismeretlen nyelvelőtag szerepel"
msgid "wikipedia tag format is deprecated"
-msgstr ""
+msgstr "a wikipédia-címke formátuma elavult"
msgid "''wikipedia''=''language:page title''"
-msgstr "''wikipedia''=''language:page title''"
+msgstr "''wikipedia''=''nyelv:oldal címe''"
msgid "wikipedia ''{0}'' language is obsolete, use ''{1}'' instead"
msgstr ""
+"A Wikipédia ''{0}'' nyelve elavult, használd inkább a következőt: ''{1}''"
msgid "wikipedia ''{0}'' language is invalid, use ''{1}'' instead"
msgstr ""
+"A Wikipédia ''{0}'' nyelve érvénytelen, használd inkább a következőt: ''{1}''"
msgid "{0} tag should not have URL-encoded values like ''%27''"
msgstr ""
@@ -27952,7 +28136,7 @@ msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV fájlok"
msgid "Importing CSV file ''%s''..."
-msgstr "CSV fájl betöltése ''%s''..."
+msgstr "CSV fájl betöltése ''%s''…"
msgid "Markers of "
msgstr "Ennek a jelölői: "
@@ -28004,7 +28188,7 @@ msgstr ""
"Hiba: {0}"
msgid "Processing..."
-msgstr "Feldolgozás..."
+msgstr "Feldolgozás…"
msgid "Aborted"
msgstr "Megszakadt"
@@ -28059,16 +28243,16 @@ msgstr ""
"vannak különféle saját pontjak, illetve egy közös is"
msgid "Select two ways with a node in common"
-msgstr "Válassz ki két vonalat egy közös ponttal"
+msgstr "Egy közös ponttal rendelkező két vonal kijelölése"
msgid "Select two ways with alone a node in common"
-msgstr "Válassz ki két vonalat csakis egyetlen közös ponttal"
+msgstr "Csak egy közös ponttal rendelkező két vonal kijelölése"
msgid "Create a grid of ways"
msgstr "Úthálózat létrehozása"
msgid "Download Track ..."
-msgstr "Nyomvonal letöltése..."
+msgstr "Nyomvonal letöltése…"
msgid "Download GPX track from openstreetmap.org"
msgstr "GPX nyomvonal letöltése az openstreetmap.org-ról"
@@ -28083,7 +28267,7 @@ msgid ""
"Error occurred while parsing gpx file {0}. Only a part of the file will be "
"available."
msgstr ""
-"Hiba történt a(z) {0} GPX fájl feldolgozása során. Csak egy része lesz "
+"Hiba történt a(z) {0} GPX-fájl feldolgozása során. Csak egy része lesz "
"elérhető a fájl tartalmának."
msgid "Error fetching URL {0}"
@@ -28138,13 +28322,13 @@ msgid "Please enter tags about your trace."
msgstr "Kérlek, adj meg címkéket is a nyomvonaladról."
msgid "Selected track: {0}"
-msgstr "Kiválasztott nyomvonal: {0}"
+msgstr "Kijelölt nyomvonal: {0}"
msgid "No GPX layer selected. Cannot upload a trace."
-msgstr "Nincs GPX réteg kiválasztva. A nyomvonalat nem lehet feltölteni."
+msgstr "Nincs GPX-réteg kijelölve. A nyomvonalat nem lehet feltölteni."
msgid "Uploading trace ..."
-msgstr "Nyomvonal feltöltés..."
+msgstr "Nyomvonal feltöltés…"
msgid "Upload canceled"
msgstr "Feltöltés megszakítva"
@@ -28171,7 +28355,7 @@ msgid "Uploads traces to openstreetmap.org"
msgstr "Nyomvonal feltöltése az openstreetmap.org-ra"
msgid "Importing..."
-msgstr "Betöltés..."
+msgstr "Betöltés…"
msgid "DXF files [ImportDxf plugin] (*.dxf)"
msgstr "DXF fájlok [ImportDxf bővítmény] (*.dxf)"
@@ -28267,7 +28451,7 @@ msgid "Simplify with initial epsilon"
msgstr "Egyszerűsítés kezdeti epszilonnal"
msgid "Save as is"
-msgstr "Mentés mint..."
+msgstr "Mentés mint…"
msgid "Snap to nodes"
msgstr "Pontokra illesztés"
@@ -28395,7 +28579,7 @@ msgid "Unresolved Addresses"
msgstr "Megoldatlan lakcímek"
msgid "Select and close"
-msgstr "Kiválaszt és bezár"
+msgstr "Kijelölés és bezárás"
msgid "Fix unresolved addresses"
msgstr "Megoldatlan lakcímek javítása"
@@ -28407,10 +28591,10 @@ msgid "Incomplete Addresses"
msgstr "Befejezetlen lakcímek"
msgid "Selected Addresses"
-msgstr "Kiválasztott lakcímek"
+msgstr "Kijelölt lakcímek"
msgid "Selected Street"
-msgstr "Kiválasztott utca"
+msgstr "Kijelölt utca"
msgid "(No data)"
msgstr "(Nincs adat)"
@@ -28447,7 +28631,7 @@ msgid "Assign address to street"
msgstr "Lakcím hozzárendelése az utcához"
msgid "Assign the selected address(es) to the selected street."
-msgstr "A kiválasztott lakcím(ek) hozzárendelése a kiválasztott utcához."
+msgstr "A kijelölt lakcím(ek) hozzárendelése a kijelölt utcához."
msgid "Set street name"
msgstr "Utcanév megadás"
@@ -28489,7 +28673,7 @@ msgid "Remove address tags"
msgstr "Lakcím címkék eltávolítása"
msgid "Marks selected addresses in the map"
-msgstr "Kiválasztott lakcímek megjelölése a térképen"
+msgstr "Kijelölt lakcímek megjelölése a térképen"
msgid "Select incomplete addresses"
msgstr "Hiányos lakcímek kijelölése"
@@ -28650,10 +28834,10 @@ msgid "Walk mode"
msgstr "Gyalogos mód"
msgid "Zoom to selected image"
-msgstr "Nagyítása a kiválasztott képre"
+msgstr "Nagyítása a kijelölt képre"
msgid "Zoom to the currently selected Mapillary image"
-msgstr "Nagyítása a jelenleg kiválasztott Mapillary képre"
+msgstr "Nagyítás a jelenleg kijelölt Mapillary képre"
msgid "Current Mapillary changeset"
msgstr "Jelenlegi Mapillary módosításcsomag"
@@ -28671,22 +28855,22 @@ msgid "Export all images"
msgstr "Összes kép exportálása"
msgid "Export selected sequence"
-msgstr "Kiválasztott sorozat exportálása"
+msgstr "Kijelölt sorozat exportálása"
msgid "Export selected images"
-msgstr "Kiválasztott képek exportálása"
+msgstr "Kijelölt képek exportálása"
msgid "Rewrite imported images"
msgstr "Importált képek átírása"
msgid "Select a folder"
-msgstr "Könyvtár kiválasztása"
+msgstr "Mappa kijelölése"
msgid "Explore"
msgstr "Böngészés"
msgid "Select a directory"
-msgstr "Könyvtár kiválasztása"
+msgstr "Könyvtár kijelölése"
msgid "Speed limit"
msgstr "Sebességkorlátozás"
@@ -28713,7 +28897,7 @@ msgid "No overtaking"
msgstr "Előzni tilos"
msgid "Pedestrian crossing"
-msgstr "Gyalogátkelő"
+msgstr "Gyalogosátkelő"
msgid "No turn"
msgstr "Kanyarodni tilos"
@@ -28752,31 +28936,31 @@ msgid "Mapillary history"
msgstr "Mapillary előzmények"
msgid "Open Mapillary history dialog"
-msgstr "Mapillary előzmény ablak megnyitása"
+msgstr "Mapillary előzmény-párbeszédablak megnyitása"
msgid "No image selected"
-msgstr "Nincs kép kiválasztva"
+msgstr "Nincs kép kijelölve"
msgid "Press \"{0}\" to download images"
-msgstr ""
+msgstr "Képek letöltéséhez nyomd meg a következőt: ''{0}''"
msgid "Mapillary picture"
-msgstr "Mapillary kép"
+msgstr "Mapillary-kép"
msgid "Open Mapillary window"
-msgstr "Mapillary ablak megnyitása"
+msgstr "Mapillary-ablak megnyitása"
msgid "Next picture"
msgstr "Következő kép"
msgid "Shows the next picture in the sequence"
-msgstr "A sorozat következő képére lép"
+msgstr "Megmutatja a sorozat következő képét"
msgid "Previous picture"
msgstr "Előző kép"
msgid "Shows the previous picture in the sequence"
-msgstr "A sorozat előző képére lép"
+msgstr "Megmutatja a sorozat előző képét"
msgid "Jump to red"
msgstr "Piroshoz ugrás"
@@ -28843,7 +29027,7 @@ msgstr ""
"A feltöltés előtt menj a beállításokba és jelentkezz be a Mapillary fiókodba."
msgid "Upload selected sequence"
-msgstr "Kiválasztott sorozat feltöltése"
+msgstr "Kijelölt sorozat feltöltése"
msgid "Delete after upload"
msgstr "Feltöltés után törlés"
@@ -28852,7 +29036,7 @@ msgid "Wait for full quality pictures"
msgstr "Várj a teljes minőségű képekre"
msgid "Follow selected image"
-msgstr "Kiválasztott kép követése"
+msgstr "Kijelölt kép követése"
msgid "Go forward"
msgstr "Menj előre"
@@ -28880,13 +29064,13 @@ msgid "Images from my file system"
msgstr ""
msgid "Select the images you want to import"
-msgstr ""
+msgstr "Importálandó képek kijelölése"
msgid "All images in a directory"
msgstr ""
msgid "Select directory to import images from"
-msgstr ""
+msgstr "Az importálandó képeket tartalmazó könyvtár kijelölése"
msgid "From existing image layer"
msgstr ""
@@ -29047,7 +29231,7 @@ msgid "Downloading"
msgstr "Letöltés"
msgid "Select mode"
-msgstr "Kiválasztás mód"
+msgstr "Kijelölés mód"
msgid "Mapillary login"
msgstr "Mapillary bejelentkezés"
@@ -29096,16 +29280,16 @@ msgid "NanoLog of {0} lines, {1} of them with coordinates."
msgstr "{0} sornyi NanoLog, ezek közül {1} koordinátákkal."
msgid "Correlate with GPX..."
-msgstr "GPX-hez viszonyítás..."
+msgstr "GPX-hez viszonyítás…"
msgid "Put on GPX..."
-msgstr "GPX-re helyezés..."
+msgstr "GPX-re helyezés…"
msgid "Correlate entries with GPS trace"
-msgstr "Elemek GPS útvonalhoz viszonyítása"
+msgstr "Elemek GPS-nyomvonalhoz viszonyítása"
msgid "Save layer..."
-msgstr "Réteg mentése..."
+msgstr "Réteg mentése…"
msgid "Save NanoLog layer"
msgstr "NanoLog réteg mentése"
@@ -29114,7 +29298,7 @@ msgid "Open NanoLog panel"
msgstr "NanoLog ablak megnyitása"
msgid "Open NanoLog file..."
-msgstr "NanoLog fájl megnyitása..."
+msgstr "NanoLog fájl megnyitása…"
msgid "Could not read NanoLog file:"
msgstr "A NanoLog fájl nem olvasható:"
@@ -29133,6 +29317,7 @@ msgstr ""
msgid "Select objects or create new objects and get recommendation."
msgstr ""
+"Jelölj ki objektumokat vagy hozz létre új objektumokat, és ajánlásokat kapsz."
msgid "Add Recommendation"
msgstr ""
@@ -29150,8 +29335,7 @@ msgid "Edit opening hours"
msgstr "Nyitvatartási idő szerkesztése"
msgid "Edit time-tag of selected element in a graphical interface"
-msgstr ""
-"A kiválasztott elem idő címkéjének szerkesztése egy grafikus felületen"
+msgstr "A kijelölt elem idő címkéjének szerkesztése egy grafikus felületen"
msgid "edit existing tag"
msgstr "létező címke szerkesztése"
@@ -29184,7 +29368,7 @@ msgid "open end"
msgstr "nyitás zárás"
msgid "Import Osm Inspector Bugs..."
-msgstr "OSM Inspector hibák beolvasása..."
+msgstr "OSM Inspector hibák beolvasása…"
msgid "OsmInspector"
msgstr "OsmInspector"
@@ -29211,7 +29395,7 @@ msgid "OSM Inspector Bugs"
msgstr "OSM Inspector Hibák"
msgid "Selected Bug Info"
-msgstr ""
+msgstr "Kijelölt hibainformáció"
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -29465,8 +29649,8 @@ msgstr ""
"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
"85, 0);\">S</span> Bővítmény<br>\n"
"</span><span style=\"font-size: medium;\"><br>\n"
-"...vagy inkább ahogy hívni kellene <br>\n"
-"<span style=\"font-size: large;\">AlignWayS(zegmensek)</span> Bővítmény..."
+"…vagy inkább ahogy hívni kellene <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(zegmensek)</span> Bővítmény…"
msgid ""
"<html>\n"
@@ -29557,7 +29741,7 @@ msgid "Don''t show this again"
msgstr "Ne mutassa újra"
msgid "What''s new..."
-msgstr "Újdonságok..."
+msgstr "Újdonságok…"
msgid "Added <b>angle preserving</b> aligning mode"
msgstr ""
@@ -29566,7 +29750,7 @@ msgid "Various improvements and bugfixes"
msgstr "Különféle továbbfejlesztések és hibajavítások"
msgid "Errr..."
-msgstr "Hiba..."
+msgstr "Hiba…"
msgid "Browser not supported."
msgstr "A böngésző nem támogatott."
@@ -29578,7 +29762,7 @@ msgid "empty"
msgstr "üres"
msgid "skip"
-msgstr "kihagy"
+msgstr "kihagyás"
msgid "House number:"
msgstr "Házszám:"
@@ -29596,48 +29780,51 @@ msgid "Tags:"
msgstr "Cimkék:"
msgid "Source:"
-msgstr ""
+msgstr "Forrás:"
msgid "Name:"
msgstr "Név:"
-msgid "updated building info"
-msgstr "frissített épület információ"
+msgid "update building info"
+msgstr "épületinformációk frissítse"
msgid "Tag Element"
-msgstr "Épület címkézése"
+msgstr "Térképelem címkézése"
msgid "Select an item to tag."
-msgstr "Válassz egy címkézendő elemet."
+msgstr "Jelölj ki egy címkézendő elemet."
msgid "Tag Building"
-msgstr ""
+msgstr "Épület címkézése"
msgid "Tools: {0}"
msgstr "Eszközök: {0}"
msgid "Area Selection"
-msgstr ""
+msgstr "Terület kijelölése"
msgid "Select an area (e.g. building) from an underlying image."
-msgstr ""
+msgstr "Terület (pl. épület) kijelölése egy alsó réteget jelentő képből."
msgid "Area Selector"
-msgstr "Területválasztó"
+msgstr "Területkijelölő"
msgid "Trying to detect an area at:"
-msgstr ""
+msgstr "Terület érzékelésének megkísérlése itt:"
-msgid "Created area"
-msgstr "Létrehozott terület"
+msgid "create building"
+msgstr "épület létrehozása"
+
+msgid "replace building"
+msgstr "épület lecserélése"
msgid "Add address"
msgid_plural "Add addresses"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Cím hozzáadása"
+msgstr[1] "Címek hozzáadása"
msgid "Unable to detect a polygon where you clicked."
-msgstr ""
+msgstr "Nem sikerül poligont észlelni a kattintás helyén."
msgid "Error Report"
msgstr "Hibajelentés"
@@ -29731,6 +29918,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -29797,7 +29990,7 @@ msgid "There is no frame loaded !"
msgstr ""
msgid "Alert Message"
-msgstr ""
+msgstr "Figyelmeztető üzenet"
msgid "Street Name:"
msgstr "Utca:"
@@ -29812,7 +30005,7 @@ msgid "Advanced settings"
msgstr "További beállítások"
msgid "Buildings tags:"
-msgstr "Épületek címkéi"
+msgstr "Épületek címkéi:"
msgid "Cannot place building outside of the world."
msgstr "Nem helyezhetsz épületet a világon kívülre."
@@ -29827,7 +30020,7 @@ msgid "Use Address dialog"
msgstr "Kérdezze meg a lakcímet"
msgid "Auto-select building"
-msgstr "Épület automatikus kiválasztása"
+msgstr "Épület automatikus kijelölése"
msgid "Use address nodes under buildings"
msgstr "Használja az épület alatti házszámokat"
@@ -29839,7 +30032,7 @@ msgid "Length step:"
msgstr "Hosszúság lépésköze:"
msgid "Advanced..."
-msgstr "További beállítások..."
+msgstr "További beállítások…"
msgid "Draw buildings"
msgstr "Épületek rajzolása"
@@ -29861,8 +30054,8 @@ msgstr "Az épületeken belüli lakcím pontok címkéit az épületekre helyezi
msgid "Select both address nodes and building ways to merge"
msgstr ""
-"Válaszd ki a lakcímet tartalmazó pontokat valamint az épület vonalakat, "
-"amivel egyesítenéd"
+"Jelöld ki a lakcímet tartalmazó pontokat valamint az épületvonalakat, "
+"amelyeket egyesítenél"
msgid "No address nodes found in the selection"
msgstr "A kijelölésben nem található lakcím pont"
@@ -29908,7 +30101,7 @@ msgstr ""
"(Nem = új gyorsítótár)"
msgid "Select Feuille"
-msgstr ""
+msgstr "Feuille kijelölése"
msgid ""
"Error loading file.\n"
@@ -29956,7 +30149,7 @@ msgid "Choose from..."
msgstr "Válasszon a következőkből:"
msgid "Select commune"
-msgstr "Commune kiválasztása"
+msgstr "Commune kijelölése"
msgid "Auto sourcing"
msgstr ""
@@ -30002,7 +30195,7 @@ msgid "Replace grey shades by white color only"
msgstr ""
msgid "Select first WMS layer in list."
-msgstr ""
+msgstr "Jelöld ki a lista első WMS-rétegét."
msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
msgstr ""
@@ -30285,6 +30478,8 @@ msgstr ""
msgid ""
"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
+"A kijelölt {0} fájl nem ennek a beépülő modulnak a gyorsítófájlja "
+"(érvénytelen kiterjesztés)"
msgid "The location {0} is already on screen. Cache not loaded."
msgstr "A {0} hely már a képernyőn van. Nincs gyorsítótár betöltés."
@@ -30334,7 +30529,7 @@ msgid "Get a new cookie (session timeout)"
msgstr ""
msgid "Save image as..."
-msgstr "Kép mentés mint..."
+msgstr "Kép mentése másként…"
msgid "PNG files (*.png)"
msgstr "PNG fájlok (*.png)"
@@ -30464,13 +30659,13 @@ msgid "Please select the scheme to delete."
msgstr "Kérlek, válaszd ki a törlendő sémát."
msgid "Use the selected scheme from the list."
-msgstr "Használd a listából kiválasztott sémát."
+msgstr "Használd a listából kijelölt sémát."
msgid "Use the current colors as a new color scheme."
msgstr "Használd a jelenlegi színeket, mint egy új színsémát."
msgid "Delete the selected scheme from the list."
-msgstr "Töröld a listából a kiválasztott sémát."
+msgstr "Töröld a listából a kijelölt sémát."
msgid "Color Schemes"
msgstr "Színsémák"
@@ -30506,7 +30701,7 @@ msgid "Configure conflation options"
msgstr "Összeolvasztás beállításai"
msgid "Remove selected matches"
-msgstr "Kiválasztott egyezések eltávolítása"
+msgstr "Kijelölt egyezések eltávolítása"
msgid "Remove ({0})"
msgstr ""
@@ -30515,7 +30710,7 @@ msgid "Conflate"
msgstr "Összevon"
msgid "Conflate selected objects"
-msgstr "Kiválasztott objektumok összevonása"
+msgstr "Kijelölt objektumok összevonása"
msgid "Conflation: {0}"
msgstr "Összeolvasztás: {0}"
@@ -30530,10 +30725,10 @@ msgid "Zoom to selected primitive(s)"
msgstr "Kijelölt elemekre nagyítás"
msgid "Select selected primitive(s)"
-msgstr "Kiválasztott elemek kijelölése"
+msgstr "Kijelölt elem(ek) kijelölése"
msgid "Select the primitives currently selected in the list"
-msgstr "Kijelöli a listában jelenleg kiválasztott elemeket"
+msgstr "A listában jelenleg kijelölt elemek kijelölése"
msgid "Generating matches"
msgstr ""
@@ -30878,10 +31073,10 @@ msgid "TCX Files (*.tcx)"
msgstr "TCX Fájlok (*.tcx)"
msgid "Download along..."
-msgstr "Letöltés valami mentén..."
+msgstr "Letöltés a következő mentén:"
msgid "Download OSM data along the selected ways."
-msgstr "OSM adat letöltése a kiválasztott vonalak mentén."
+msgstr "OSM adatok letöltése a kijelölt vonalak mentén."
msgid "Download Along"
msgstr "Letöltés valami mentén"
@@ -30890,7 +31085,7 @@ msgid "Please select 1 or more ways to download along"
msgstr ""
msgid "Download from OSM along selected ways"
-msgstr "OSM adat letöltése a kiválasztott vonalak mentén"
+msgstr "OSM adatok letöltése a kijelölt vonalak mentén"
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -30911,13 +31106,13 @@ msgid "Convert to GPX layer with anonymised time"
msgstr "Konvertálás anonimizált időbélyegű GPX-réteggé"
msgid "edit gpx tracks"
-msgstr "GPX nyomvonalak szerkesztése"
+msgstr "GPX-nyomvonalak szerkesztése"
msgid "Import path from GPX layer"
-msgstr "Útvonal importálása GPX-rétegről"
+msgstr "Elérési útvonal importálása GPX-rétegről"
msgid "Drop existing path"
-msgstr "Meglévő útvonal elvetése"
+msgstr "Meglévő elérési útvonal elvetése"
msgid "No GPX data layer found."
msgstr "Nem található GPX-adatréteg."
@@ -30956,7 +31151,7 @@ msgid "Are you sure?"
msgstr "Biztos vagy benne?"
msgid "New tool..."
-msgstr "Új eszköz..."
+msgstr "Új eszköz…"
msgid "Install"
msgstr "Telepítés"
@@ -31090,7 +31285,7 @@ msgid "configure the connected DG100"
msgstr "a csatlakozó DG100 konfigurálása"
msgid "delete data after import"
-msgstr "adat törlése betöltés után"
+msgstr "adatok törlése betöltés után"
msgid "Importing data from device."
msgstr ""
@@ -31371,7 +31566,7 @@ msgid "External ruleset directory:"
msgstr ""
msgid "Select directory"
-msgstr ""
+msgstr "Könyvtár kijelölése"
msgid "Vehicle"
msgstr "Jármű"
@@ -31559,7 +31754,7 @@ msgid "Calibration Layer"
msgstr "Kalibrációs réteg"
msgid "A deprecated calibration geometry of {0} nodes by {1}"
-msgstr "Egy érvénytelenített kalibrációs alakzat {0} ponttal, tőle: {1}"
+msgstr "Elavult kalibrációs alakzat {0} ponttal a következőtől: {1}"
msgid "A calibration geometry of {0} nodes by {1}"
msgstr "Egy érvénytelenített kalibrációs alakzat {0} ponttal, tőle: {1}"
@@ -31578,7 +31773,7 @@ msgstr ""
"Biztos vagy benne, hogy ez a kalibrációs alakzat rosszul van igazítva?"
msgid "Warning: deprecation is basically irreversible!"
-msgstr "Figyelem: az érvénytelenítés alapvetően nem visszavonható!"
+msgstr "Figyelem: az érvénytelenítés lényegében visszavonhatatlan!"
msgid "To store imagery offsets you must be a registered OSM user."
msgstr ""
@@ -31600,7 +31795,7 @@ msgid "Notifying the server of the deprecation..."
msgstr "Szerver értesítése az érvénytelenítésről…"
msgid "Get Imagery Offset..."
-msgstr "Légifelvétel-eltolás letöltése..."
+msgstr "Légifelvétel-eltolás letöltése…"
msgid "Download offsets for current imagery from a server"
msgstr "Eltolás értékek letöltése a szerverről az aktuális légifelvételhez"
@@ -31612,7 +31807,7 @@ msgstr ""
"töltsd fel az eltolást."
msgid "Loading imagery offsets..."
-msgstr "Légifelvétel-eltolás betöltése..."
+msgstr "Légifelvétel-eltolás betöltése…"
msgid "Error processing XML response: {0}"
msgstr "Hiba történt az XML válasz feldolgozása közben: {0}"
@@ -31642,7 +31837,7 @@ msgid ""
msgstr ""
"Az aktuális légifelvétel réteg el lett mozgatva, hogy hozzávetőleg "
"illeszkedjen\n"
-"az OSM adatokhoz a területen. Kérlek ellenőrizd letöltött GPS nyomvonalak\n"
+"az OSM adatokhoz a területen. Kérlek ellenőrizd letöltött GPS-nyomvonalak\n"
"és az OSM adatok összehasonlításával, hogy még mindig pontos-e."
msgid ""
@@ -31670,7 +31865,7 @@ msgid "You are to notify moderators of this offset. Why?"
msgstr "A moderátorokat készülsz tájékoztatni erről az eltolásról. Miért?"
msgid "Reporting the offset..."
-msgstr "Eltolás jelentése..."
+msgstr "Eltolás jelentése…"
msgid "An imagery offset of {0}"
msgstr "A légifelvétel-eltolás mértéke {0}"
@@ -31700,7 +31895,7 @@ msgid "Unable to connect to the server"
msgstr "Nem lehet kapcsolódni a szerverhez"
msgid "Store Imagery Offset..."
-msgstr "Légifelvétel-eltolás feltöltése..."
+msgstr "Légifelvétel-eltolás feltöltése…"
msgid ""
"Upload an offset for current imagery (or calibration object geometry) to a "
@@ -31719,8 +31914,8 @@ msgid ""
"The selected object can be used as a calibration geometry. What do you "
"intend to do?"
msgstr ""
-"A kiválasztott objektumot kalibrációs alakzatnak lehet használni. Mit "
-"szeretnél tenni?"
+"A kijelölt objektumot kalibrációs alakzatnak lehet használni. Mit szeretnél "
+"tenni?"
msgid ""
"The topmost imagery layer has no offset. Are you sure you want to upload "
@@ -31751,7 +31946,7 @@ msgstr ""
"objektumról és arról, hogy hol található."
msgid "Uploading a new offset..."
-msgstr "Új eltolás feltöltése..."
+msgstr "Új eltolás feltöltése…"
msgid "This string should be 3 to 200 letters long."
msgstr "A szöveg 3 - 200 karakter hosszú kell legyen."
@@ -31856,7 +32051,7 @@ msgid "Working Level"
msgstr ""
msgid "Selects the working level."
-msgstr ""
+msgstr "Kijelöli a munkaszintet"
msgid "Level Name"
msgstr ""
@@ -32202,7 +32397,7 @@ msgid "Lakewalker Plugin Preferences"
msgstr "Lakewalker bővítmény beállítások"
msgid "A plugin to trace water bodies on Landsat imagery."
-msgstr "A bővítmény a vízfelületek felrajzolásához Landsat műholdképről"
+msgstr "Bővítmény víztestek felrajzolásához Landsat műholdképről."
msgid ""
"Maximum number of segments allowed in each generated way. Default 250."
@@ -32292,7 +32487,7 @@ msgid "Live GPS"
msgstr "Élő GPS"
msgid "Show GPS data."
-msgstr "GPS-adat megjelenítése."
+msgstr "GPS-adatok megjelenítése."
msgid "Status"
msgstr "Állapot"
@@ -32310,7 +32505,7 @@ msgid "LiveGPS layer"
msgstr "LiveGPS réteg"
msgid "Capture GPS Track"
-msgstr "GPS nyomvonal felvétele"
+msgstr "GPS-nyomvonal felvétele"
msgid "Connect to gpsd server and show current position in LiveGPS layer."
msgstr ""
@@ -32356,19 +32551,19 @@ msgid "Path Length"
msgstr "Útvonal hossza"
msgid "Selection Length"
-msgstr "Kiválasztás hossza"
+msgstr "Kijelölés hossza"
msgid "Selection Area"
-msgstr "Kiválasztás területe"
+msgstr "Kijelölés területe"
msgid "Selection Radius"
-msgstr "Kiválasztás sugara"
+msgstr "Kijelölés sugara"
msgid "Angle"
msgstr "Szög"
msgid "Angle between two selected Nodes"
-msgstr "Két kiválasztott pont közti szög"
+msgstr "Két kijelölt pont közti szög"
msgid "Layer to make measurements"
msgstr "Réteg a mérések elvégzéséhez"
@@ -32588,7 +32783,7 @@ msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
msgid "Download open data"
-msgstr "Nyílt adat letöltése"
+msgstr "Nyílt adatok letöltése"
msgid "License URL not available: {0}"
msgstr "A licenc URL nem elérhető: {0}"
@@ -32653,7 +32848,7 @@ msgid "Update modules"
msgstr "Modulok frissítése"
msgid "Update the selected modules"
-msgstr "A kiválasztott modulok frissítése"
+msgstr "A kijelölt modulok frissítése"
msgid "Please restart JOSM to activate the downloaded modules."
msgstr "Kérlek, indítsd újra a JOSM-et a letöltött modulok aktiválásához."
@@ -32766,13 +32961,13 @@ msgid "7Zip Files"
msgstr "7Zip fájlok"
msgid "Reading 7Zip file..."
-msgstr "7Zip fájl olvasása..."
+msgstr "7Zip fájl olvasása…"
msgid "Zip Files"
msgstr "Zip fájlok"
msgid "Reading Zip file..."
-msgstr "Zip fájl olvasása..."
+msgstr "Zip fájl olvasása…"
msgid "Cannot transform to WGS84"
msgstr "Nem lehet WGS84-re alakítani"
@@ -32842,37 +33037,36 @@ msgid "View OSM Wiki page"
msgstr "OSM Wikioldal megtekintése"
msgid "Launch browser to the OSM Wiki page of the selected data set"
-msgstr "Böngésző indítása a kiválasztott adathalmaz OSM Wikioldalával"
+msgstr "Böngésző indítása a kijelölt adathalmaz OSM Wiki-oldalával"
msgid "View Local Portal page"
msgstr "Helyi Portál oldal megtekintése"
msgid "Launch browser to the local portal page of the selected data set"
-msgstr "Böngésző indítása a kiválasztott adathalmaz helyi portál oldalával"
+msgstr "Böngésző indítása a kijelölt adathalmaz helyiportál-oldalával"
msgid "View National Portal page"
msgstr "Nemzeti Portál oldal megtekintése"
msgid "Launch browser to the national portal page of the selected data set"
-msgstr "Böngésző indítása a kiválasztott adathalmaz nemzeti portál oldalával"
+msgstr "Böngésző indítása a kijelölt adathalmaz nemzetiportál-oldalával"
msgid "View License"
msgstr "Licenc megtekintése"
msgid "Launch browser to the license page of the selected data set"
-msgstr ""
-"Böngésző indítása a kiválasztott adathalmaz licencnyilatkozati oldalával"
+msgstr "Böngésző indítása a kijelölt adathalmaz licencnyilatkozati oldalával"
msgid "View License (summary)"
msgstr "Licenc megtekintése (összefoglaló)"
msgid "Launch browser to the summary license page of the selected data set"
msgstr ""
-"Böngésző indítása a kiválasztott adathalmaz licencnyilatkozati összefoglaló "
+"Böngésző indítása a kijelölt adathalmaz licencnyilatkozati összefoglaló "
"oldalával"
msgid "View the license of the selected data set"
-msgstr "A jelenleg kiválasztott adathalmaz licencének megtekintése."
+msgstr "A jelenleg kijelölt adathalmaz licencének megtekintése."
msgid ""
"Warning: Cannot download module ''{0}''. Its download link is not known. "
@@ -33032,7 +33226,7 @@ msgid "Processing module files..."
msgstr "Modul fájlok feldolgozása…"
msgid "Download module list..."
-msgstr "Modul lista letöltése..."
+msgstr "Modullista letöltése…"
msgid "Downloading module list from ''{0}''"
msgstr "Modul lista letöltése innen: „{0}”"
@@ -33119,7 +33313,7 @@ msgid "Prefs"
msgstr "Preferenciák"
msgid "Load file..."
-msgstr "Fájl betöltése..."
+msgstr "Fájl betöltése…"
msgid "Place"
msgstr "Hely"
@@ -33197,7 +33391,7 @@ msgid "Close the dialog, discard projection preference changes"
msgstr "A dialógus becsukása és a vetítési beállítások elvetése"
msgid "Loading..."
-msgstr "Töltés..."
+msgstr "Töltés…"
msgid "PDF file preview"
msgstr "PDF fájl előnézet:"
@@ -33327,7 +33521,7 @@ msgid "change file modification time:"
msgstr "fájlmódosítás idejének változtatása:"
msgid "to gps time"
-msgstr "GPS időhöz"
+msgstr "GPS-időhöz"
msgid "to previous value (unchanged mtime)"
msgstr "a korábbi értékre (módosítatlan mtime)"
@@ -33395,7 +33589,7 @@ msgid "Edit photo GPS data"
msgstr "Fénykép GPS-adatok szerkesztése"
msgid "Edit GPS data of selected photo."
-msgstr "A kiválasztott fotó GPS-adatainak szerkesztése"
+msgstr "A kijelölt fotó GPS-adatainak szerkesztése"
msgid "Edit Photo GPS Data"
msgstr "Fénykép GPS-adatok szerkesztése"
@@ -33461,13 +33655,13 @@ msgid "Do you want to save current calibration of layer {0}?"
msgstr "Szeretnéd elmenteni a(z) {0} réteg jelenlegi kalibrációját?"
msgid "Select an option"
-msgstr "Válassz egy lehetőséget"
+msgstr "Egy opció kijelölése"
msgid "Load Picture Calibration..."
-msgstr "Kép kalibráció betöltése..."
+msgstr "Képkalibráció betöltése…"
msgid "Loads calibration data from a file"
-msgstr "Kalibrációs adat betöltése fájlból"
+msgstr "Kalibrációs adatok betöltése fájlból"
msgid "Loading file failed: {0}"
msgstr "Fájl betöltése sikertelen: {0}"
@@ -33479,7 +33673,7 @@ msgid "Import World File Calibration..."
msgstr ""
msgid "Loads calibration data from a world file"
-msgstr "Kalibrációs adat betöltése world fájlból"
+msgstr "Kalibrációs adatok betöltése world fájlból"
msgid "Reset Calibration"
msgstr "Kalibráció visszaállítása"
@@ -33707,7 +33901,7 @@ msgid "Osmosis polygon filter files"
msgstr "Osmosis poligon szűrőfájlok"
msgid "Print..."
-msgstr "Nyomtatás..."
+msgstr "Nyomtatás…"
msgid "Print the map"
msgstr "Térkép nyomtatás"
@@ -33760,6 +33954,14 @@ msgstr "A nyomtatás meghiúsult."
msgid "Repeat last fix"
msgstr "Előző javítás ismétlése"
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -33811,6 +34013,12 @@ msgstr "Hogyan szeretnéd folytatni?"
msgid "PT_Assistant Proceed Request"
msgstr "PT_Assistant Folytatás Kérés"
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr "PT: a stop_position nem része vonalnak"
@@ -33832,6 +34040,9 @@ msgstr ""
"Annak ellenőrzése, hogy az útvonalkapcsolat kompatibilis-e a public "
"transport séma 2-es verziójával"
+msgid "PT: Relation member roles do not match tags"
+msgstr "PT: a kapcsolat tagok címkéi nem egyeznek"
+
msgid "Fix error"
msgstr "Hiba javítása"
@@ -33846,8 +34057,21 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
-msgstr "PT: a kapcsolat tagok címkéi nem egyeznek"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
+msgstr ""
msgid "PT: Route should start and end with a stop_position"
msgstr "PT: az útvonal stop_position taggal kell kezdődjön és végződjön"
@@ -33871,7 +34095,7 @@ msgstr ""
msgid "Type letter to select the fix variant or press Escape for no fix"
msgstr ""
-"Egy javítás változat kiválasztásához nyomj egy betűt, vagy Escapet a javítás "
+"Egy javításváltozat kijelöléséhez nyomj egy betűt, vagy Escape-et a javítás "
"kihagyásához"
msgid "PT: Stop area relation has no stop position"
@@ -33922,13 +34146,13 @@ msgid "Public Transport: Disable GTFS"
msgstr "Tömegközlekedés: GTFSStops tiltása"
msgid "Create Stops from GTFS ..."
-msgstr "Megálló készítés GTFS-ből..."
+msgstr "Megálló készítés GTFS-ből…"
msgid "Create Stops from a GTFS file"
-msgstr "Megálló készítés GTFS fájlból..."
+msgstr "Megálló készítés GTFS fájlból"
msgid "Select GTFS file (stops.txt)"
-msgstr "GTFS fájl kiválasztása (stops.txt)"
+msgstr "GTFS fájl kijelölése (stops.txt)"
msgid "File \"{0}\" does not exist"
msgstr "A(z) \"{0}\" fájl nem létezik"
@@ -33959,7 +34183,7 @@ msgid "Type of stops to add"
msgstr "Hozzáadandó megálló típusok"
msgid "Time on your GPS device"
-msgstr "Idő a GPS készülékeden"
+msgstr "Idő a GPS-készülékeden"
msgid "HH:MM:SS.sss"
msgstr "HH:MM:SS.sss"
@@ -34013,7 +34237,7 @@ msgid "[gap]"
msgstr "[eltérés]"
msgid "Route patterns ..."
-msgstr "Útvonal minták..."
+msgstr "Útvonalminták…"
msgid "Edit Route patterns for public transport"
msgstr "Tömegközlekedési útvonalminták szerkesztése"
@@ -34082,7 +34306,7 @@ msgid "Create Stops from a GPX file"
msgstr "Megállók készítése GPX-fájlból"
msgid "Select GPX file"
-msgstr "GPX-fájl kiválasztása"
+msgstr "GPX-fájl kijelölése"
msgid "The GPX file contained no tracks or waypoints."
msgstr "A GPX-fájl nem tartalmazott nyomvonalat vagy útpontot."
@@ -34155,7 +34379,7 @@ msgid "A valid public_transport:version=2 route is required"
msgstr "Érvényes, public_transport:version=2 típusú útvonal szükséges"
msgid "Invalid selection"
-msgstr "Érvénytelen kiválasztás"
+msgstr "Érvénytelen kijelölés"
msgid "Public transport routes"
msgstr "Tömegközlekedési útvonalak"
@@ -34217,7 +34441,7 @@ msgid "Relation Toolbox: {0}"
msgstr "Kapcsolat Eszköztár: {0}"
msgid "another..."
-msgstr "másik..."
+msgstr "másik…"
msgid "Add/remove members from the chosen relation"
msgstr "Tagok hozzáadása/törlése a kiválasztott kapcsolathoz"
@@ -34226,7 +34450,7 @@ msgid "Clear the chosen relation"
msgstr ""
msgid "Create a multipolygon from selected objects"
-msgstr "Multipoligon létrehozás a kiválasztott objektumokból"
+msgstr "Multipoligon létrehozás a kijelölt objektumokból"
msgid "Create multipolygons from rings"
msgstr "Multipoligon létrehozás gyűrűkből"
@@ -34283,7 +34507,7 @@ msgid "Open relation wiki page"
msgstr "Kapcsolat wikioldalának megnyitása"
msgid "Select relation in main selection."
-msgstr "Kapcsolat kiválasztása a globális kiválasztásban"
+msgstr "Kapcsolat kijelölése a fő kijelölésben"
msgid "Fix roles of the chosen relation members"
msgstr "A kiválasztott kapcsolattagok szerepének javítása"
@@ -34334,11 +34558,10 @@ msgid "Revert changeset fully"
msgstr "Módosításcsomag teljes visszaállítása"
msgid "Revert selection only"
-msgstr "Csak a kiválasztott elemek visszaállítása"
+msgstr "Kijelölés visszaállítása"
msgid "Revert selection and restore deleted objects"
-msgstr ""
-"Kiválasztott elemek visszaállítása és a törölt objektumok helyreállítása"
+msgstr "Kijelölés visszaállítása és törölt objektumok helyreállítása"
msgid "Revert changeset"
msgstr "Módosításcsomag visszaállítása"
@@ -34362,16 +34585,16 @@ msgid "Missing merge target for {0} with id {1}"
msgstr "Hiányzó egyesítési cél {0} számára {1} azonosítóval"
msgid "Objects history"
-msgstr "Objektumok előzménye"
+msgstr "Objektumok előzményei"
msgid "History reverter"
-msgstr "Előzmény visszállító"
+msgstr "Előzmény-visszaállító"
msgid "Tool: Display objects history dialog"
-msgstr "Eszköz: objektumelőzmény dialógusablak megjelenítése"
+msgstr "Eszköz: objektumelőzmények párbeszédablak megjelenítése"
msgid "Preparing history data..."
-msgstr "Előzmény adatok előkészítése…"
+msgstr "Előzményadatok előkészítése…"
msgid "Remote Control has been asked to revert a changeset."
msgstr ""
@@ -34572,7 +34795,7 @@ msgid "SDS data file"
msgstr ""
msgid "Load..."
-msgstr "Betöltés..."
+msgstr "Töltés…"
msgid "Load separate data store data from a file."
msgstr ""
@@ -34587,7 +34810,7 @@ msgid "Information about SDS."
msgstr "Információk az SDS-ről."
msgid "About SDS..."
-msgstr "SDS névjegy..."
+msgstr "SDS névjegy…"
msgid "Open a preferences dialog for SDS."
msgstr ""
@@ -34647,7 +34870,7 @@ msgid "Cannot connect to SDS server: "
msgstr "Nem lehet az SDS szerverhez csatlakozni: "
msgid "Save..."
-msgstr "Mentés..."
+msgstr "Mentés…"
msgid "Save the current separate data store information to a file."
msgstr ""
@@ -34666,10 +34889,10 @@ msgid "Seamark Inspector"
msgstr ""
msgid "Select only one object"
-msgstr ""
+msgstr "Csak egy objektum kijelölése"
msgid "Select a map object"
-msgstr ""
+msgstr "Térképobjektum kijelölése"
msgid "Shape actions panel"
msgstr ""
@@ -34696,13 +34919,13 @@ msgid "Align building "
msgstr ""
msgid "Select building"
-msgstr ""
+msgstr "Épület kijelölése"
msgid "Select road"
-msgstr ""
+msgstr "Út kijelölése"
msgid "Select none"
-msgstr ""
+msgstr "Kijelölés megszüntetése"
msgid "Min Distance:"
msgstr "Legkisebb távolság"
@@ -34876,8 +35099,8 @@ msgid ""
"Launch your default software for sending an email to the selected contact "
"address"
msgstr ""
-"Alapértelmezett szoftver futtatása a kiválasztott kapcsolati címre való e-"
-"mail küldéshez"
+"Alapértelmezett szoftver futtatása a kijelölt kapcsolati címre való e-mail "
+"küldéshez"
msgid "Edit tags"
msgstr "Címkék szerkesztése"
@@ -34999,6 +35222,9 @@ msgid ""
"select a street for the addr:street tag and a node to mark the start of "
"numbering.)"
msgstr ""
+"Jelölj ki egy legalább négy pontból álló zárt vonalat. (Opcionálisan "
+"kijelölhetsz egy utcát is az addr:street címkéhez és egy pontot a számozás "
+"kezdetének megjelöléséhez.)"
msgid "Terrace"
msgstr "Terasz"
@@ -35019,10 +35245,11 @@ msgid "Zoom to the selected item in the todo list."
msgstr ""
msgid "Select all Unmarked and Zoom"
-msgstr ""
+msgstr "Az összes megjelöletlen kijelölése és nagyítás"
msgid "Select and zoom to all of the unmarked items in the todo list."
msgstr ""
+"A teendőlista összes megjelöletlen elemének kijelölése és rájuk közelítés"
msgid "Pass"
msgstr ""
@@ -35078,9 +35305,12 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
-msgid "Select the checkbox to:"
+msgid "Set default url"
msgstr ""
+msgid "Select the checkbox to:"
+msgstr "Jelölőnégyzet kijelölése a következőhöz:"
+
msgid "Skip"
msgstr ""
@@ -35100,6 +35330,15 @@ msgid "<html><a href=\"\">List of tasks</a></html>"
msgstr ""
msgid "Select a task ..."
+msgstr "Feladat kijelölése…"
+
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
msgstr ""
msgid "Set download area (m²)"
@@ -35194,7 +35433,7 @@ msgid "No set of parameter is active!"
msgstr ""
msgid "Select parameter"
-msgstr ""
+msgstr "Paraméter kijelölése"
msgid "Tracer2: add a way with {0} points"
msgstr ""
@@ -35236,7 +35475,7 @@ msgid "Add predefined"
msgstr ""
msgid "Select predefined parameter"
-msgstr ""
+msgstr "Előre meghatározott paraméter kijelölése"
msgid "Modify list of parameter for server request."
msgstr ""
@@ -35302,7 +35541,7 @@ msgid ""
"Collecting randomness..."
msgstr ""
"Új kulcspár generálása.\n"
-"Véletlenszerű adat gyűjtése..."
+"Véletlenszerű adatok gyűjtése…"
msgid "UID"
msgstr "UID"
@@ -35385,6 +35624,8 @@ msgid ""
"Selected node was:\n"
"{0}"
msgstr ""
+"A kijelölt pont a következő volt:\n"
+"{0}"
msgid "Sorry, there are no Signatures for the selected Attribute."
msgstr ""
@@ -35393,12 +35634,14 @@ msgid ""
"Selected key value pair was:\n"
"{0}={1}"
msgstr ""
+"A kijelölt kulcs–érték pár a következő volt:\n"
+"{0}={1}"
msgid "Sorry, there are no Signatures for the selected Segment."
msgstr ""
msgid "Selected WaySegment was:"
-msgstr ""
+msgstr "A kijelölt vonalszakasz a következő volt:"
msgid "Signature Files"
msgstr "Aláírás Fájlok"
@@ -35425,7 +35668,7 @@ msgid "Manipulation Warning"
msgstr ""
msgid "Select a signing key from your keyring-file:"
-msgstr ""
+msgstr "Aláírókulcs kijelölése a kulcstartó-fájlodból:"
msgid "Don''t ask again for the key"
msgstr "Ne kérdezz újra a kulcsról"
@@ -35437,7 +35680,7 @@ msgid "Create new Key"
msgstr "Új Kulcs készítése"
msgid "Select a Key to sign"
-msgstr "Kulcs kiválasztása aláíráshoz"
+msgstr "Kulcs kijelölése aláíráshoz"
msgid ""
"The object with the ID \"{0}\" ({1}) is newly created.\n"
@@ -35452,7 +35695,7 @@ msgid "Please give a tolerance in meters"
msgstr "Kérlek adj meg tűrést, méterben"
msgid "Select as much as you like:"
-msgstr "Válassz amennyit csak szeretnél:"
+msgstr "Jelölj ki annyit, amennyit csak szeretnél:"
msgid "Survey"
msgstr "Felmérés"
@@ -35500,7 +35743,7 @@ msgid "User-ID:"
msgstr "Felhasználó-ID:"
msgid "Select algorithm:"
-msgstr "Algoritmus kiválasztása:"
+msgstr "Algoritmus kijelölése:"
msgid "Choose Bitlength (Strength):"
msgstr ""
@@ -35610,8 +35853,7 @@ msgstr ""
"hogy biztosan konzisztensek-e az adatok.<br><br>Hiba: {0}</html>"
msgid "Edit turn relations and lane lengths for selected node."
-msgstr ""
-"Szerkezd meg a kapcsolatokat és a sávok hosszát a kiválasztott ponthoz."
+msgstr "Szerkezd meg a kapcsolatokat és a sávok hosszát a kijelölt ponthoz."
msgid "Validate turn- and lane-length-relations for consistency."
msgstr "Kanyar- és sávhossz-kapcsolatok ellenörzése a konzisztenciához."
@@ -35632,7 +35874,7 @@ msgid "Automatically fixes the issue."
msgstr "Probléma automatikus javítása."
msgid "Selects the offending relation."
-msgstr "Problémás kapcsolat kiválasztása."
+msgstr "Problémás kapcsolat kijelölése."
msgid "Add turn"
msgstr "Kanyar hozzáadása"
@@ -35704,16 +35946,16 @@ msgstr ""
"eltüntetve lett ''{1}'' rétegről"
msgid "Clear the selected roles or delete the selected members"
-msgstr "Eltávolítja a kiválasztott szerepet, vagy törli a kiválasztott tagot"
+msgstr "Eltávolítja a kijelölt szerepeket, vagy törli a kijelölt tagokat"
msgid "Insert new relation members from object in the clipboard"
msgstr "Beilleszt egy új kapcsolattagot a vágólapról"
msgid "Move the selected relation members down by one position"
-msgstr "A kiválasztott kapcsolattagokat egy hellyel lejjebb mozgatja"
+msgstr "A kijelölt kapcsolattagokat egy hellyel lejjebb mozgatja"
msgid "Move the selected relation members up by one position"
-msgstr "A kiválasztott kapcsolattagokat egy hellyel följebb mozgatja"
+msgstr "A kijelölt kapcsolattagokat egy hellyel följebb mozgatja"
msgid "Edit basic attributes of a turn restriction"
msgstr "A kanyarodási korlátozás alapvető tulajdonságainak szerkesztése"
@@ -35822,7 +36064,7 @@ msgid "Delete this turn restriction"
msgstr "Kanyarodási korlátozás törlése"
msgid "Select this turn restriction"
-msgstr "Kanyarodási korlátozás kiválasztása"
+msgstr "Kanyarodási korlátozás kijelölése"
msgid "Activate the layer this turn restriction belongs to and zoom to it"
msgstr "A kanyarodási korlátozás rétegének aktiválása és ráközelítés"
@@ -35894,7 +36136,8 @@ msgid ""
"Select the vehicle types this turn restriction is <strong>not</strong> "
"applicable for."
msgstr ""
-"Válaszd ki, melyik járműtípusokra <strong>nem</strong> érvényes a korlátozás."
+"Jelöld ki, melyik járműtípusokra <strong>nem</strong> érvényes ez a "
+"bekanyarodási korlátozás."
msgid "Public Service Vehicles"
msgstr "Közösségi közlekedési járművek"
@@ -35921,16 +36164,16 @@ msgid "Use non-standard exceptions"
msgstr "Nem szabványos kivételek használata"
msgid "Remove the currently selected vias"
-msgstr "Kiválasztott via tagok eltávolítása"
+msgstr "Kijelölt via tagok eltávolítása"
msgid "Move the selected vias down by one position"
-msgstr "Kiválasztott via tagok egy hellyel lejjebb mozgatása"
+msgstr "Kijelölt via tagok egy hellyel lejjebb mozgatása"
msgid "Move the selected vias up by one position"
-msgstr "Kiválasztott via tagok egy hellyel följebb mozgatása"
+msgstr "Kijelölt via tagok egy hellyel följebb mozgatása"
msgid "Copy the selected vias to the clipboard"
-msgstr "Kiválasztott via tagok másolása vágólapra"
+msgstr "Kijelölt via tagok másolása vágólapra"
msgid "Insert ''via'' objects from the clipboard"
msgstr "''via'' objektumok beillesztése vágólapról"
@@ -35964,9 +36207,9 @@ msgid ""
"selection only.<br>Deselect to display all turn restrictions in the current "
"data set.</html>"
msgstr ""
-"<html>Jelöld be, hogy csak a pillanatnyilag kiválasztott objektumokhoz "
-"tartozó kanyarodási korlátozások jelenjenek meg a listában.<br>Ha nincs "
-"bejelölve, az adathalmaz összes kanyarodási korlátozása megjelenik.</html>"
+"<html>Jelöld be, hogy csak a pillanatnyilag kijelölt objektumokhoz tartozó "
+"kanyarodási korlátozások jelenjenek meg a listában.<br>Ha nincs bejelölve, "
+"az adathalmaz összes kanyarodási korlátozása megjelenik.</html>"
msgid "Turn Restrictions"
msgstr "Kanyarodási korlátozások"
@@ -35985,10 +36228,10 @@ msgstr "Új kanyarodási korlátozás létrehozása"
msgid "Set the current JOSM selection to the selected turn restrictions"
msgstr ""
-"Az aktuális JOSM kijelölés beállítása kiválasztott kanyarodási korlátozásként"
+"Az aktuális JOSM kijelölés beállítása kijelölt kanyarodási korlátozásként"
msgid "Select in current data layer"
-msgstr "Kiválasztás az aktuális adatrétegen"
+msgstr "Kijelölés a jelenlegi adatrétegen"
msgid "Zoom to the currently selected turn restrictions"
msgstr "Közelítés a kijelölt kanyarodási korlátozásokra"
@@ -36260,7 +36503,7 @@ msgstr ""
"szerkesztett"
msgid "Undelete object..."
-msgstr "Objektum visszaállítás..."
+msgstr "Objektum visszaállítás…"
msgid "Undelete object by id"
msgstr "Objektum visszaállítás azonosítóval"
@@ -36277,7 +36520,7 @@ msgid ""
msgstr ""
msgid "Select if the data should be added into a new layer"
-msgstr "Jelölje be, ha az adatokat egy új réteghez kellene hozzáadni"
+msgstr "Jelöld be, ha az adatokat egy új réteghez kellene hozzáadni"
msgid "Start undeleting"
msgstr "Visszaállítás kezdődik"
@@ -36289,7 +36532,7 @@ msgid "Add nodes at intersections"
msgstr "Pontok hozzáadása a metszéspontokon"
msgid "Add missing nodes at intersections of selected ways."
-msgstr "A kiválasztott vonalak metszéspontjain pótolja a hiányzó pontokat."
+msgstr "A kijelölt vonalak metszéspontjain pótolja a hiányzó pontokat."
msgid "Please select one or more ways with intersections of segments."
msgstr ""
@@ -36342,7 +36585,7 @@ msgid "The current selection cannot be used for splitting."
msgstr "A jelenlegi kijelölés nem használható a vágáshoz."
msgid "The selected way is not closed."
-msgstr "A kiválasztott vonal nem zárt."
+msgstr "A kijelölt vonal nem zárt."
msgid "The selected way does not contain the selected node."
msgid_plural "The selected way does not contain all the selected nodes."
@@ -36413,7 +36656,7 @@ msgid "Create a circle arc"
msgstr "Körívet készít a meglévő vonalból"
msgid "Select custom URL"
-msgstr "Egyedi URL kiválasztása"
+msgstr "Egyedi URL kijelölése"
msgid "Please select one of custom URLs (configured in Preferences)"
msgstr "Válasszon ki egy egyedi URL-t (konfigurálható a Beállítások között)"
@@ -36535,7 +36778,7 @@ msgid "Set tags for multiple objects"
msgstr "Címke beállítása több objektumra"
msgid "Delete from history"
-msgstr ""
+msgstr "Törlés az előzményekből"
msgid "Find primitives with these tags"
msgstr ""
@@ -36544,14 +36787,14 @@ msgid "Multitag Background: highlight"
msgstr ""
msgid "Replace geometry of selected object with a new one"
-msgstr "A kiválasztott objektum geometriájának lecserélése egy újra"
+msgstr "A kijelölt objektum geometriájának lecserélése egy újra"
msgid ""
"This tool replaces geometry of one object with another, and so requires "
"exactly two objects to be selected."
msgstr ""
"Ez az eszköz lecseréli egy objektum geometriáját egy másikra, ezért pontosan "
-"kettő kiválasztott objektumra van szüksége."
+"kettő kijelölt objektumra van szüksége."
msgid ""
"This tool can only replace a node, upgrade a node to a way or a "
@@ -36627,7 +36870,7 @@ msgid "Adjacent nodes"
msgstr "Szomszédos pontok"
msgid "Select adjacent nodes"
-msgstr "Szomszédos pontok kiválasztása"
+msgstr "Szomszédos pontok kijelölése"
msgid "Adjacent ways"
msgstr "Szomszédos vonalak"
@@ -36640,13 +36883,13 @@ msgid "All connected ways"
msgstr "Összes csatlakozó vonal"
msgid "Select all connected ways"
-msgstr "Összes olyan vonal kiválasztása, amik elérhetőek ebből a vonalból"
+msgstr "Az összes kapcsolódó vonal kijelölése"
msgid "Intersecting ways"
msgstr "Keresztezett vonalak"
msgid "Select intersecting ways"
-msgstr "A kiválasztott vonalat keresztező vonalak kiválasztása"
+msgstr "Keresztező vonalak kijelölése"
msgid "Please select some ways to find connected and intersecting ways!"
msgstr ""
@@ -36657,7 +36900,7 @@ msgid "All intersecting ways"
msgstr "Összes keresztezett vonal"
msgid "Select all intersecting ways"
-msgstr "Összes keresztezett vonal kiválasztása"
+msgstr "Összes keresztező vonal kijelölése"
msgid "Please select some ways to find all connected and intersecting ways!"
msgstr ""
@@ -36668,7 +36911,7 @@ msgid "Middle nodes"
msgstr "Köztes pontok"
msgid "Select middle nodes"
-msgstr "A vonal kiválasztott két pontja közötti pontok kiválasztása"
+msgstr "A vonal kijelölt két pontja közötti pontok kijelölése"
msgid "Please select two nodes connected by way!"
msgstr "Válassz ki két pontot, amiket vonal köt össze!"
@@ -36680,7 +36923,7 @@ msgid "All inside [testing]"
msgstr ""
msgid "Select all inside selected polygons"
-msgstr ""
+msgstr "Minden kijelölése a kijelölt poligonokon belül"
msgid ""
"Nothing found. Please select some closed ways or multipolygons to find all "
@@ -36691,8 +36934,7 @@ msgid "Area boundary [testing]"
msgstr ""
msgid "Select relation or all ways that forms area boundary"
-msgstr ""
-"Kijelöli a kapcsolatot, vagy az összes vonalat, amik a területhatárt alkotják"
+msgstr "A területhatárt alkotó kapcsolat vagy összes vonal kijelölése"
msgid ""
"Nothing found. Please select way that is a part of some polygon formed by "
@@ -36702,49 +36944,51 @@ msgstr ""
"vonalakból álló poligonnak"
msgid "Select Highway"
-msgstr "Út kiválasztása"
+msgstr "Út kijelölése"
msgid "Select highway for the name/ref given"
-msgstr "Út kiválasztása név/ref alapján"
+msgstr "Út kijelölése név/ref alapján"
msgid "Please select one or two ways for this action"
msgstr "A művelethez válassz ki egy vagy két vonalat"
msgid "Select last modified nodes"
-msgstr "Legutóbb módosított pontok"
+msgstr "A legutóbb módosított pontok kijelölése"
msgid "Select last modified ways"
-msgstr "Legutóbb módosított vonalak"
+msgstr "A legutóbb módosított vonalak kijelölése"
msgid "Select Way Nodes"
-msgstr "Vonal pontjai"
+msgstr "Vonalpontok kijelölése"
msgid "Select all nodes of a selected way."
-msgstr "A kiválasztott vonal pontjainak kiválasztása"
+msgstr "Egy kijelölt vonal összes pontjának kijelölése."
msgid "Undo selection"
msgstr "Kiválasztás visszavonása"
msgid "Reselect last added object or selection form history"
-msgstr "A legutóbb hozzáadott objektum, vagy kiválasztás újbóli kiválasztása"
+msgstr ""
+"A legutóbb hozzáadott objektum vagy kijelölés újból kijelölése az "
+"előzményekben"
msgid "Unselect nodes"
-msgstr "Pont kiválasztás visszavonása"
+msgstr "Pont kijelölésének visszavonása"
msgid "Removes all nodes from selection"
-msgstr "Az összes pont eltávolítása a kiválasztásból"
+msgstr "Az összes pont eltávolítása a kijelölésből"
msgid "Import Video"
-msgstr "Videó betöltése"
+msgstr "Videó importálása"
msgid "Sync a video against this GPS track"
-msgstr "Videó szinkronizálása ezzel a GPS nyomvonallal"
+msgstr "Videó szinkronizálása ezzel a GPS-nyomvonallal"
msgid "Remove Video"
msgstr "Videó eltávolítása"
msgid "removes current video from layer"
-msgstr "aktuális videó eltávolítása a rétegről"
+msgstr "a jelenlegi videó eltávolítása a rétegről"
msgid "Play/Pause"
msgstr "Lejátszás/Szünet"
@@ -36777,7 +37021,7 @@ msgid "Jump To"
msgstr "Ugrás"
msgid "jumps to the entered gps time"
-msgstr "a megadott GPS időre ugrás"
+msgstr "a megadott GPS-időre ugrás"
msgid "Loop"
msgstr "Ismétlés"
@@ -36834,7 +37078,7 @@ msgid "Jump to"
msgstr "Ugrás oda"
msgid "Jump to GPS time"
-msgstr "Ugrás GPS időhöz"
+msgstr "Ugrás GPS-időhöz"
msgid "Shows current position in the video"
msgstr "Az aktuális pozíció mutatása a videón"
@@ -36887,7 +37131,7 @@ msgid "Way Download"
msgstr "Út letöltése"
msgid "Download map data on the end of selected way"
-msgstr "Térképadat letöltése a kiválasztott vonal végéhez"
+msgstr "Térképadatok letöltése a kijelölt vonal végén"
msgid ""
"<html>Neither a node nor a way with an endpoint outside of the<br>current "
@@ -36924,10 +37168,10 @@ msgid "Node ''{0}'' is a junction with more than 2 connected ways."
msgstr ""
msgid "Enter search expression here.."
-msgstr "Keresési kifejezés megadási tt..."
+msgstr "Keresési kifejezés megadási itt…"
msgid "Select waypoint to move map"
-msgstr "Válassz ki egy pontot a vonalon, a térkép mozgatásához"
+msgstr "A térkép mozgatásához jelölj ki egy útpontot"
msgid "Waypoint search"
msgstr "Útpontok keresése"
@@ -36971,7 +37215,7 @@ msgid ""
"Copies the {0} template to the system clipboard instantiated with the "
"coordinates of the first selected node"
msgstr ""
-"A vágólapra másolja a(z) {0} sablont, kitöltve az első kiválasztott pont "
+"A vágólapra másolja a(z) {0} sablont, kitöltve az első kijelölt pont "
"koordinátáival"
msgid "Copy {0} template"
@@ -37044,8 +37288,7 @@ msgid "Open Article"
msgstr "Cikk megnyitása"
msgid "Opens the Wikipedia article of the selected item in a browser"
-msgstr ""
-"Megnyitja böngészőben a kiválasztott elemhez tartozó Wikipédia cikket"
+msgstr "Megnyitja böngészőben a kijelölt elemhez tartozó Wikipédia cikket"
msgid "Sets the default language for the Wikipedia articles"
msgstr "Megadja az alapértelmezett nyelvet a Wikipédia cikkekhez"
@@ -37067,3 +37310,9 @@ msgstr "Vezetés"
msgid "Drive a race car on this layer"
msgstr "Autóverseny ezen a rétegen"
+
+#~ msgid "SDFE Terræn Skyggekort (40 cm)"
+#~ msgstr "SDFE Terræn Skyggekort (40 cm)"
+
+#~ msgid "SDFE Overflade Skyggekort (40 cm)"
+#~ msgstr "SDFE Overflade Skyggekort (40 cm)"
diff --git a/i18n/po/hy.po b/i18n/po/hy.po
index 31b81c4..e2db40a 100644
--- a/i18n/po/hy.po
+++ b/i18n/po/hy.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2011-04-13 21:51+0000\n"
"Last-Translator: Gev777 <Unknown>\n"
"Language-Team: Armenian <hy at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-03 04:34+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:35+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: hy\n"
msgid "Cancel"
@@ -2403,6 +2403,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2499,6 +2502,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2676,6 +2685,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7839,6 +7851,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7875,6 +7890,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13251,6 +13269,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14843,9 +14864,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14985,10 +15018,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15405,10 +15555,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15834,6 +15984,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27747,7 +27909,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27774,7 +27936,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27877,6 +28042,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31766,6 +31937,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31812,6 +31991,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31831,6 +32016,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31845,7 +32033,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33049,6 +33250,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33073,6 +33277,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/ia.po b/i18n/po/ia.po
index 2825569..3921b03 100644
--- a/i18n/po/ia.po
+++ b/i18n/po/ia.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2011-08-29 01:02+0000\n"
"Last-Translator: Emilio Sepulveda <Unknown>\n"
"Language-Team: Interlingua <ia at 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-07-03 04:47+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:48+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: ia\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2403,6 +2403,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2499,6 +2502,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2676,6 +2685,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7839,6 +7851,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7875,6 +7890,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13251,6 +13269,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14843,9 +14864,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14985,10 +15018,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15405,10 +15555,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15834,6 +15984,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27747,7 +27909,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27774,7 +27936,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27877,6 +28042,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31766,6 +31937,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31812,6 +31991,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31831,6 +32016,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31845,7 +32033,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33049,6 +33250,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33073,6 +33277,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/id.po b/i18n/po/id.po
index f485a5d..926f659 100644
--- a/i18n/po/id.po
+++ b/i18n/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2016-03-10 03:36+0000\n"
"Last-Translator: Ezagren <ezagren at gmail.com>\n"
"Language-Team: Indonesian <id at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-03 04:48+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:48+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: id\n"
"X-Language: id_ID\n"
@@ -2555,6 +2555,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Ekspresi pencarian tidak berlaku"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Saring"
@@ -2657,6 +2660,12 @@ msgstr "Semua way/garis yang tertutup"
msgid "object without useful tags"
msgstr "objek tanpa tag berguna"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "metadata"
@@ -2848,6 +2857,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr "Jarak pada angka diharapkan"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Token tidak diharapkan. Diharapkan {0}, ditemukan {1}"
@@ -8226,6 +8238,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr "Jumlah argumen untuk bookmark salah"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Terdapat kesalahan saat membaca penanda yang dimasukkan: %s"
@@ -8266,6 +8281,9 @@ msgstr "Hapus bookmark yang dipilih saat ini"
msgid "Rename the currently selected bookmark"
msgstr "Ganti nama bookmark yang dipilih saat ini"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "lintang terkecil"
@@ -14095,6 +14113,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Info pengguna"
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Memulai upload dengan satu permintaan per primitif"
@@ -15836,9 +15857,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -15978,10 +16011,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -16398,10 +16548,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -16827,6 +16977,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -28943,7 +29105,7 @@ msgstr ""
msgid "Name:"
msgstr "Nama:"
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -28970,7 +29132,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -29073,6 +29238,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -33171,6 +33342,14 @@ msgstr "Pencetakan gagal"
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -33217,6 +33396,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -33236,6 +33421,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -33250,7 +33438,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -34501,6 +34702,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -34525,6 +34729,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/is.po b/i18n/po/is.po
index 39bee87..b581f12 100644
--- a/i18n/po/is.po
+++ b/i18n/po/is.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2015-11-06 00:32+0000\n"
"Last-Translator: Stefán Örvar Sigmundsson <stefan.orvar.sigmundsson at emi.is>\n"
"Language-Team: Icelandic <is at 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-07-03 04:47+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:47+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: is\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2417,6 +2417,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2513,6 +2516,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2692,6 +2701,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7864,6 +7876,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7902,6 +7917,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "Minnsta breiddargráða"
@@ -13299,6 +13317,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14894,9 +14915,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -15036,10 +15069,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15456,10 +15606,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15885,6 +16035,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27799,7 +27961,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27826,7 +27988,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27929,6 +28094,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31818,6 +31989,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31864,6 +32043,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31883,6 +32068,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31897,7 +32085,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33101,6 +33302,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33125,6 +33329,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/it.po b/i18n/po/it.po
index cca0157..32f1255 100644
--- a/i18n/po/it.po
+++ b/i18n/po/it.po
@@ -4,16 +4,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm 20081003\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
-"PO-Revision-Date: 2017-05-30 06:53+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
+"PO-Revision-Date: 2017-07-22 14:52+0000\n"
+"Last-Translator: Gábor Babos <Unknown>\n"
"Language-Team: Italian <talk-it at lists.openstreetmap.org>\n"
"MIME-Version: 1.0\n"
"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-07-03 04:48+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:49+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: it\n"
"X-Language: it_IT\n"
"X-Source-Language: en\n"
@@ -2656,6 +2656,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Espressione di ricerca non valida"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Filtro"
@@ -2759,6 +2762,12 @@ msgstr "tutti i percorsi chiusi"
msgid "object without useful tags"
msgstr "oggetto privo di etichette utili"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "metadati"
@@ -2957,6 +2966,9 @@ msgstr "Atteso un intero positivo"
msgid "Range of numbers expected"
msgstr "Atteso intervallo di numeri"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Token inaspettato. Era atteso {0}, trovato {1}"
@@ -8674,6 +8686,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Numero errato di argomenti per il segnalibro"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Errore nella lettura della voce del segnalibro: %s"
@@ -8716,6 +8731,9 @@ msgstr "Rimuovi i segnalibri attualmente selezionati"
msgid "Rename the currently selected bookmark"
msgstr "Rinomina i segnalibri attualmente selezionati"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "Lat min"
@@ -14888,6 +14906,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Lettura delle informazioni utente ..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Inizio del caricamento con una richiesta per primitiva ..."
@@ -16782,9 +16803,21 @@ msgstr "Mapbox Satellite"
msgid "DigitalGlobe Premium Imagery"
msgstr "DigitalGlobe Premium Imagery"
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr "DigitalGlobe Standard Imagery"
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -16924,11 +16957,128 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
-msgstr "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
-msgid "IGN Argentina (WMS)"
-msgstr "IGN Argentina (WMS)"
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
+msgstr ""
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI bianco-nero 2.5m"
@@ -17345,10 +17495,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -17775,6 +17925,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr "Lodi - Italia"
@@ -23040,7 +23202,7 @@ msgid "Beer Garden"
msgstr "Beer garden"
msgid "Bar"
-msgstr "Bar"
+msgstr "Locale"
msgid "Tourism"
msgstr "Turismo"
@@ -30084,8 +30246,8 @@ msgstr "Origine:"
msgid "Name:"
msgstr "Nome:"
-msgid "updated building info"
-msgstr "informazioni building aggiornate"
+msgid "update building info"
+msgstr ""
msgid "Tag Element"
msgstr "Etichetta per elemento"
@@ -30111,8 +30273,11 @@ msgstr "Selettore di area"
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
-msgstr "Area creata"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
+msgstr ""
msgid "Add address"
msgid_plural "Add addresses"
@@ -30230,6 +30395,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr "Debug"
@@ -34412,6 +34583,14 @@ msgstr "La stampa è fallita."
msgid "Repeat last fix"
msgstr "Ripeti l’ultima correzione"
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -34458,6 +34637,12 @@ msgstr "Vuoi continuare?"
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -34477,6 +34662,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr "Correggi errore"
@@ -34491,7 +34679,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -35756,6 +35957,9 @@ msgstr "Abilita il plugin Tofix"
msgid "Auto delete layer"
msgstr "Auto cancella il livello"
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -35780,6 +35984,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/ja.po b/i18n/po/ja.po
index 22257f4..41310bd 100644
--- a/i18n/po/ja.po
+++ b/i18n/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2017-06-04 15:25+0000\n"
"Last-Translator: fujimoto <fujimoto at internet.ne.jp>\n"
"Language-Team: Japanese <tr at openstreetmap.jp>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-03 04:48+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:49+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"X-Poedit-Country: JAPAN\n"
"Language: ja\n"
"X-Poedit-Language: Japanese\n"
@@ -2425,6 +2425,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "検索条件が無効です"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "フィルター"
@@ -2526,6 +2529,12 @@ msgstr "全ての閉じたウェイ"
msgid "object without useful tags"
msgstr "利用可能のタグがついていないオブジェクト"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "メタデータ"
@@ -2708,6 +2717,9 @@ msgstr "正の整数が必要です"
msgid "Range of numbers expected"
msgstr "数値の範囲が必要です"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "予期しないトークンです。{0}が必要な場所に{1}がありました。"
@@ -7898,6 +7910,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "ブックマークに対する引数の数が誤っています"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "ブックマークエントリ %s の読み取りに失敗しました"
@@ -7934,6 +7949,9 @@ msgstr "選択中のブックマークを削除"
msgid "Rename the currently selected bookmark"
msgstr "選択中のブックマークの名前を変更"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "最小緯度"
@@ -13460,6 +13478,9 @@ msgstr "XML タグ ''{1}'' の属性 ''{0}'' に不正な値。入力値: {2}。
msgid "Reading user info ..."
msgstr "ユーザー情報を読込中"
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "プリミティブ単位に1回のリクエストでアップロードを開始 ..."
@@ -15112,9 +15133,21 @@ msgstr "Mapbox Satellite"
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -15254,10 +15287,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15674,10 +15824,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -16105,6 +16255,18 @@ msgstr "OSMIE Dail Election Areas"
msgid "OSMIE T.ie Land not in Counties"
msgstr "OSMIE T.ie Land not in Counties"
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
@@ -28152,8 +28314,8 @@ msgstr ""
msgid "Name:"
msgstr "名前:"
-msgid "updated building info"
-msgstr "建物情報を更新しました"
+msgid "update building info"
+msgstr ""
msgid "Tag Element"
msgstr "要素をタグ付け"
@@ -28179,8 +28341,11 @@ msgstr "エリア選択ツール"
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
-msgstr "作成されたエリア"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
+msgstr ""
msgid "Add address"
msgid_plural "Add addresses"
@@ -28282,6 +28447,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -32258,6 +32429,14 @@ msgstr "印刷に失敗しました。"
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -32304,6 +32483,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -32323,6 +32508,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -32337,7 +32525,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33553,6 +33754,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33577,6 +33781,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr "ダウンロード範囲を設定 (m²)"
diff --git a/i18n/po/ka.po b/i18n/po/ka.po
index 8a648a8..835e354 100644
--- a/i18n/po/ka.po
+++ b/i18n/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2011-12-16 00:14+0000\n"
"Last-Translator: datogogishvili <Unknown>\n"
"Language-Team: Georgian <ka at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-03 04:43+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:43+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: ka\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2408,6 +2408,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2504,6 +2507,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2681,6 +2690,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7844,6 +7856,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7880,6 +7895,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13256,6 +13274,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14848,9 +14869,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14990,10 +15023,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15410,10 +15560,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15839,6 +15989,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27752,7 +27914,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27779,7 +27941,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27882,6 +28047,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31771,6 +31942,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31817,6 +31996,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31836,6 +32021,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31850,7 +32038,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33054,6 +33255,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33078,6 +33282,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/km.po b/i18n/po/km.po
index 64f6862..5f8788d 100644
--- a/i18n/po/km.po
+++ b/i18n/po/km.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2015-01-27 10:25+0000\n"
"Last-Translator: Sophea Sok <sksophea at gmail.com>\n"
"Language-Team: Khmer <km at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-03 04:49+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:50+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2547,6 +2547,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "កន្សោមស្វែងរកមិនត្រឹមត្រូវ"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "តម្រង"
@@ -2649,6 +2652,12 @@ msgstr "ផ្លូវដែលបានបិទទាំងអស
msgid "object without useful tags"
msgstr "វត្ថុដែលគ្មានស្លាកមានប្រយោជន៍"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "ទិន្នន័យមេតា"
@@ -2840,6 +2849,9 @@ msgstr "បានរំពឹងទុកចំនួនគត់វ
msgid "Range of numbers expected"
msgstr "ជួរលេខដែលបានរំពឹងទុក"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "ថូខឹនដែលមិនបានរំពឹងទុក។ បានរំពឹងទុក {0}, រកឃើញ {1}"
@@ -8335,6 +8347,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "លេខអាគុយម៉ង់ខុសសម្រាប់ចំណាំ"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "កំហុសក្នុងការអានធាតុចំណាំ៖ %s"
@@ -8373,6 +8388,9 @@ msgstr "លុបចំណាំដែលបានជ្រើស
msgid "Rename the currently selected bookmark"
msgstr "ប្ដូរឈ្មោះចំណាំដែលបានជ្រើសបច្ចុប្បន្ន"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "min lat"
@@ -14359,6 +14377,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "កំពុងអានទិន្នន័យអ្នកប្រើ..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "កំពុងចាប់ផ្ដើមផ្ទុកឡើងដោយសំណើមួយក្នុងមួយព្រីមីទីវ..."
@@ -16169,9 +16190,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -16311,10 +16344,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -16731,10 +16881,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -17160,6 +17310,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -29160,7 +29322,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -29187,7 +29349,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -29290,6 +29455,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -33179,6 +33350,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -33225,6 +33404,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -33244,6 +33429,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -33258,7 +33446,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -34462,6 +34663,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -34486,6 +34690,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/ko.po b/i18n/po/ko.po
index b41cd58..8650c56 100644
--- a/i18n/po/ko.po
+++ b/i18n/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2017-05-17 08:29+0000\n"
"Last-Translator: Glados <Unknown>\n"
"Language-Team: Korean <ko at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-03 04:50+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:51+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: ko\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2397,6 +2397,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "잘못된 검색 표현식"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "필터"
@@ -2496,6 +2499,12 @@ msgstr "마감된 모든 선"
msgid "object without useful tags"
msgstr "태그가 붙지 않은 개체"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "메타데이터"
@@ -2674,6 +2683,9 @@ msgstr "양의 정수가 지정되지 않음"
msgid "Range of numbers expected"
msgstr "숫자값이 범위를 벗어남"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7833,6 +7845,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7869,6 +7884,9 @@ msgstr "현재 선택된 북마크 제거"
msgid "Rename the currently selected bookmark"
msgstr "현재 선택된 북마크 이름 바꾸기"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "최소 위도"
@@ -13273,6 +13291,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14867,9 +14888,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -15009,10 +15042,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15429,10 +15579,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15858,6 +16008,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27775,7 +27937,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27802,7 +27964,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27905,6 +28070,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31794,6 +31965,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31840,6 +32019,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31859,6 +32044,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31873,7 +32061,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33077,6 +33278,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33101,6 +33305,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/ku.po b/i18n/po/ku.po
index b4a22f5..f4d2ebd 100644
--- a/i18n/po/ku.po
+++ b/i18n/po/ku.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2017-01-31 19:32+0000\n"
"Last-Translator: Rokar ✌ <Unknown>\n"
"Language-Team: Kurdish <ku at 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-07-03 04:50+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:51+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -2402,6 +2402,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2498,6 +2501,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2675,6 +2684,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7838,6 +7850,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7874,6 +7889,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13250,6 +13268,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14842,9 +14863,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14984,10 +15017,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15404,10 +15554,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15833,6 +15983,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27746,7 +27908,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27773,7 +27935,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27876,6 +28041,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31765,6 +31936,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31811,6 +31990,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31830,6 +32015,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31844,7 +32032,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33048,6 +33249,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33072,6 +33276,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/ky.po b/i18n/po/ky.po
index 7d2aa3f..a2da03b 100644
--- a/i18n/po/ky.po
+++ b/i18n/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2012-12-18 02:36+0000\n"
"Last-Translator: SimpleLeon <Unknown>\n"
"Language-Team: Kirghiz <ky at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-03 04:49+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:50+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -2402,6 +2402,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2498,6 +2501,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2675,6 +2684,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7838,6 +7850,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7874,6 +7889,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13250,6 +13268,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14842,9 +14863,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14984,10 +15017,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15404,10 +15554,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15833,6 +15983,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27746,7 +27908,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27773,7 +27935,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27876,6 +28041,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31765,6 +31936,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31811,6 +31990,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31830,6 +32015,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31844,7 +32032,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33048,6 +33249,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33072,6 +33276,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/lb.po b/i18n/po/lb.po
index d567ee9..1b82fa8 100644
--- a/i18n/po/lb.po
+++ b/i18n/po/lb.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2016-04-28 18:56+0000\n"
"Last-Translator: Charel <ceilenbecker at gmail.com>\n"
"Language-Team: Luxembourgish <lb at 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-07-03 04:52+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:53+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}:D''Optioun \"{1}\" ass net eendeiteg"
@@ -2402,6 +2402,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2498,6 +2501,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2675,6 +2684,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7838,6 +7850,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7874,6 +7889,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13250,6 +13268,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14842,9 +14863,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14984,10 +15017,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15404,10 +15554,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15833,6 +15983,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27746,7 +27908,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27773,7 +27935,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27876,6 +28041,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31765,6 +31936,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31811,6 +31990,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31830,6 +32015,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31844,7 +32032,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33048,6 +33249,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33072,6 +33276,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/lo.po b/i18n/po/lo.po
index f84123a..a061d7b 100644
--- a/i18n/po/lo.po
+++ b/i18n/po/lo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2009-09-15 10:06+0000\n"
"Last-Translator: Anousone <Unknown>\n"
"Language-Team: Lao <lo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-03 04:50+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:52+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2403,6 +2403,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2499,6 +2502,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2676,6 +2685,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7839,6 +7851,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7875,6 +7890,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13251,6 +13269,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14843,9 +14864,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14985,10 +15018,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15405,10 +15555,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15834,6 +15984,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27747,7 +27909,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27774,7 +27936,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27877,6 +28042,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31766,6 +31937,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31812,6 +31991,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31831,6 +32016,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31845,7 +32033,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33049,6 +33250,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33073,6 +33277,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/lt.po b/i18n/po/lt.po
index 4e1ec27..1a837e2 100644
--- a/i18n/po/lt.po
+++ b/i18n/po/lt.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
-"PO-Revision-Date: 2017-06-08 05:32+0000\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
+"PO-Revision-Date: 2017-07-28 18:45+0000\n"
"Last-Translator: Aurimas Fišeras <Unknown>\n"
"Language-Team: Lithuanian <lt at li.org>\n"
"MIME-Version: 1.0\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%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-07-03 04:51+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:52+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: lt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -945,7 +945,7 @@ msgid "Move Node..."
msgstr "Perkelti tašką..."
msgid "Edit latitude and longitude of a node."
-msgstr "Keisti taško platumą ir ilgumą"
+msgstr "Keisti taško platumą ir ilgumą."
msgid "New Layer"
msgstr "Naujas sluoksnis"
@@ -2600,17 +2600,20 @@ msgid "MapCSS selector"
msgstr "MapCSS parinkiklis"
msgid "Selection settings"
-msgstr ""
+msgstr "Pažymėjimo nustatymai"
msgid "Additional settings"
-msgstr ""
+msgstr "Papildomi nustatymai"
msgid "Search syntax"
-msgstr ""
+msgstr "Paieškos sintaksė"
msgid "Invalid search expression"
msgstr "Netinkama paieškos išraiška"
+msgid "Search by preset"
+msgstr "Paieška pagal ruošinį"
+
msgid "Filter"
msgstr "Filtras"
@@ -2633,7 +2636,7 @@ msgstr ""
" {0}"
msgid "Search hints"
-msgstr ""
+msgstr "Paieškos patarimai"
msgid "basics"
msgstr "pagrindai"
@@ -2713,6 +2716,12 @@ msgstr "visi uždari keliai"
msgid "object without useful tags"
msgstr "objektas be naudingų žymų"
+msgid "all objects that use the address preset"
+msgstr "visi objektai naudojantys adreso ruošinį"
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "meta duomenys"
@@ -2905,6 +2914,9 @@ msgstr "Tikimasi teigiamo sveiko skaičiaus"
msgid "Range of numbers expected"
msgstr "Tikimasi skaičių intervalo"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Netikėta leksema. Tikėtasi {0}, rasta {1}"
@@ -4032,13 +4044,13 @@ msgid "Running test {0}"
msgstr "Vykdomas testas {0}"
msgid "E-mail address is invalid"
-msgstr "E-pašto adresas netinkamas"
+msgstr "El. pašto adresas netinkamas"
msgid "E-mail address contains an invalid username: {0}"
-msgstr "E-pašto adrese yra netinkamas naudotojo vardas: {0}"
+msgstr "El. pašto adrese yra netinkamas naudotojo vardas: {0}"
msgid "E-mail address contains an invalid domain: {0}"
-msgstr "E-pašto adrese yra netinkamas domenas: {0}"
+msgstr "El. pašto adrese yra netinkamas domenas: {0}"
msgid "Email validator"
msgstr "Elektroninio pašto validatorius"
@@ -5475,7 +5487,7 @@ msgid "The easting at the mouse pointer."
msgstr "Nuokrypis į rytus ant pelės žymeklio."
msgid "The geographic latitude at the mouse pointer."
-msgstr "Pelės žymeklio geografinė platuma"
+msgstr "Pelės žymeklio geografinė platuma."
msgid "The geographic longitude at the mouse pointer."
msgstr "Pelės žymeklio geografinė ilguma"
@@ -5511,10 +5523,12 @@ msgid " ({0})"
msgstr " ({0})"
msgid "<h2>Filter active: {0}</h2>"
-msgstr ""
+msgstr "<h2>Aktyvus filtras: {0}</h2>"
msgid "</p><p>Click again on filter button to see all objects.</p></html>"
msgstr ""
+"</p><p>Spauskite dar kartą ant filtro mygtuko visiems objektams "
+"pamatyti.</p></html>"
msgid "Enlarge"
msgstr "Išplėsti"
@@ -5544,22 +5558,21 @@ msgid ""
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Alternatyviai, jūs galimai įvedėte <strong>kaladėlės adresą</strong> "
-"vienai kaladėlei formate <i>zoomlevel/x/y</i>, pvz. <i>15/256/223</i>. "
-"Kaladėlės adresai formate <i>zoom,x,y</i> arba <i>zoom;x;y</i> galimi taip "
-"pat.</html>"
+"<html>Arba įveskite <strong>kaladėlės adresą</strong> vienai kaladėlei "
+"formatu <i>mastelis/x/y</i>, pvz., <i>15/256/223</i>. Kaladėlės adresai "
+"formatu <i>mastelis,x,y</i> arba <i>mastelis;x;y</i> galimi taip pat.</html>"
msgid "Tile address:"
-msgstr "Kaladėlių adresas:"
+msgstr "Kaladėlės adresas:"
msgid "Apply the tile address"
-msgstr "Pritaikyti kaladėlių adresą"
+msgstr "Pritaikyti kaladėlės adresą"
msgid "Please enter a tile address"
-msgstr "Prašome įvesti kaladėlių adresą"
+msgstr "Įveskite kaladėlės adresą"
msgid "The current value isn''t a valid tile address"
-msgstr "Dabartinė reikšmė nėra tinkamas kaladėlių adresas"
+msgstr "Dabartinė reikšmė nėra tinkamas kaladėlės adresas"
msgid "Please enter a tile index"
msgstr "Prašome įvesti kaladėlių indeksą"
@@ -8292,7 +8305,7 @@ msgstr ""
"<html>Ryšys buvo pakeistas.<br><br>Ar norite įrašyti savo pakeitimus?</html>"
msgid "Unsaved changes"
-msgstr "Neišsaugoti pakeitimai"
+msgstr "Neįrašyyi pakeitimai"
msgid "Delete the currently edited relation"
msgstr "Šalinti dabar redaguojamą ryšį"
@@ -8480,6 +8493,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Netinkamas žymelės argumentų skaičius"
+msgid "Home location"
+msgstr "Namų vieta"
+
msgid "Error reading bookmark entry: %s"
msgstr "Klaida skaitant žymelės įrašą: %s"
@@ -8519,6 +8535,9 @@ msgstr "Išimti dabar pažymėtas žymeles"
msgid "Rename the currently selected bookmark"
msgstr "Pervadinti dabar pažymėtą žymelę"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr "Atsiųsti žymeklius mano {0} paskutiniams pakeitimams"
+
msgid "min lat"
msgstr "min plat"
@@ -8547,7 +8566,7 @@ msgid "The string ''{0}'' is not a valid double value."
msgstr "Eilutė „{0}“ nėra tinkama trupmeninio skaičiaus reikšmė."
msgid "Value for latitude in range [-90,90] required."
-msgstr "Reikia platumos reikšmės intervale [-90,90]"
+msgstr "Reikia platumos reikšmės intervale [-90,90]."
msgid "Value for longitude in range [-180,180] required."
msgstr "Reikia ilgumos reikšmės intervale [-180,180]"
@@ -9311,13 +9330,13 @@ msgid "Saving layer to ''{0}'' ..."
msgstr "Saugomas sluoksnis į „{0}“ ..."
msgid "Unsaved changes - Save/Upload before exiting?"
-msgstr "Neįrašyti pakeitimai - Įrašyti/Įkelti prieš išeinant?"
+msgstr "Neįrašyti pakeitimai - Įrašyti/Išsiųsti prieš išeinant?"
msgid "Unsaved changes - Save/Upload before deleting?"
-msgstr "Neįrašyti pakeitimai - Įrašyti/Įkelti prieš ištrinant?"
+msgstr "Neįrašyti pakeitimai - Įrašyti/Išsiųsti prieš šalinant?"
msgid "Unsaved changes - Save/Upload before restarting?"
-msgstr ""
+msgstr "Neįrašyti pakeitimai - Įrašyti/Išsiųsti prieš paleidžiant iš naujo?"
msgid "Uploading and saving modified layers ..."
msgstr "Įkeliami ir įrašomi pakeisti sluoksniai..."
@@ -9399,10 +9418,12 @@ msgstr ""
"Išeiti iš JOSM neįrašius pakeitimų. Neįrašyti pakeitimai bus prarasti."
msgid "Restart now!"
-msgstr ""
+msgstr "Paleisti iš naujo dabar!"
msgid "Restart JOSM without saving. Unsaved changes are lost."
msgstr ""
+"Paleisti JOSM iš naujo neįrašius pakeitimų. Neįrašyti pakeitimai bus "
+"prarasti."
msgid "Delete now!"
msgstr "Šalinti dabar!"
@@ -9415,20 +9436,22 @@ msgstr "Atlikti veiksmus prieš išeinant"
msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
msgstr ""
-"Išeiti iš JOSM įrašant. Neįrašyti pakeitimai įkeliami ir/arba įrašomi."
+"Išeiti iš JOSM įrašant. Neįrašyti pakeitimai išsiunčiami ir/arba įrašomi."
msgid "Perform actions before restarting"
msgstr ""
msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
msgstr ""
+"Paleisti JOSM iš naujo išsaugojant. Neišsaugoti pakeitimai yra išsiunčiami "
+"ir/arba įrašomi."
msgid "Perform actions before deleting"
msgstr "Atlikti veiksmus prieš šalinant"
msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
msgstr ""
-"Įrašyti/įkelti sluoksnius prieš ištrinant. Neįrašyti pakeitimai nebus "
+"Įrašyti/Išsiųsti sluoksnius prieš šalinant. Neįrašyti pakeitimai nebus "
"prarasti."
msgid "Preparing layer ''{0}'' for upload ..."
@@ -10857,10 +10880,10 @@ msgid "Authorize URL:"
msgstr "Autorizavimo URL:"
msgid "OSM login URL:"
-msgstr "OSM prisijungimo internetinis adresas:"
+msgstr "OSM prisijungimo URL:"
msgid "OSM logout URL:"
-msgstr "OSM atsijungimo internetinis adresas:"
+msgstr "OSM atsijungimo URL:"
msgid "Click to reset the OAuth settings to default values"
msgstr "Spauskite OAuth nustatymų atkūrimui į numatytąsias reikšmes"
@@ -13501,7 +13524,7 @@ msgid "Use preset ''{0}''"
msgstr "Naudoti ruošinį „{0}“"
msgid "Elements of type {0} are supported."
-msgstr "Palaikomi „{0}“ tipo elementai."
+msgstr "Palaikomi elementai: „{0}“."
msgid "This preset also sets: {0}"
msgstr "Šis ruošinys taip pat nustato: {0}"
@@ -13879,7 +13902,7 @@ msgid "Illegal longitude value for parameter ''{0}'', got {1}"
msgstr "Negalima ilgumos vertė parametrui ''{0}'', gauta {1}"
msgid "Illegal latitude value for parameter ''{0}'', got {1}"
-msgstr "Negalima platumos vertė parametrui ''{0}'', gauta {1}"
+msgstr "Negalima platumos vertė parametrui „{0}“, gauta {1}"
msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
msgstr "Netikėta „{0}“ reikšmė pakeitimų užklausos URL, gauta {1}"
@@ -14213,7 +14236,7 @@ msgid "The server replied an error with code {0}."
msgstr "Severis išvedė klaidą, su kodu {0}."
msgid "OSM Server Files bzip2 compressed"
-msgstr ""
+msgstr "OSM serverio failai suspausti bzip2"
msgid "Prolog of OsmChange document already written. Please write only once."
msgstr ""
@@ -14298,7 +14321,7 @@ msgstr ""
"failą.<br>Klaida:<br>{0}</html>"
msgid "OSM Server Files gzip compressed"
-msgstr "OSM Server Files gzip suspaustas"
+msgstr "OSM serverio failai suspausti bzip2"
msgid "Parsing OSM history data ..."
msgstr "Nagrinėjami OSM istorijos duomenys ..."
@@ -14474,6 +14497,9 @@ msgstr "Neleistina XML žymos „{1}“ atributo „{0}“ reikšmė. Gauta „{
msgid "Reading user info ..."
msgstr "Skaitoma naudotojo informacija ..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -15522,6 +15548,8 @@ msgid ""
"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
"check your internet connection."
msgstr ""
+"<html>Nepavyko užmegzti ryšio su nutolusiu "
+"serveriu<br>„{0}“.<br>Patikrinkite interneto ryšį."
msgid ""
"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
@@ -15563,12 +15591,19 @@ msgid ""
"server or you are using an invalid URL to access<br>it. Please carefully "
"check the server''s address ''{0}'' for typos."
msgstr ""
+"OSM serveris „{0}“ nežino apie objektą, kurį<br>bandėte perskaityti, "
+"atnaujinti ar pašalinti. Arba atitinkamas objektas<br>neegzistuoja "
+"serveryje, arba naudojate neteisingą URL prie jo<br>prieiti. Patikrinkite "
+"serverio adresą „{0}“."
msgid ""
"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
"name ''{1}'' could not be resolved. <br>Please check the API URL in your "
"preferences and your internet connection."
msgstr ""
+"<html>Nepavyko užmegzti ryšio su nutolusiu serveriu<br>„{0}“.<br>Nepavyko "
+"nustatyti serverio „{1}“ adreso. <br>Patikrinkite API URL nustatymuose ir "
+"interneto ryšį."
msgid ""
"<html>The server reports that an object is deleted.<br><strong>Uploading "
@@ -15947,6 +15982,8 @@ msgid ""
"You requested too many nodes (limit is 50,000). Either request a smaller "
"area, or use planet.osm"
msgstr ""
+"Užklausėte per daug taškų (limitas yra 50.000). Užklauskite mažesnio ploto, "
+"arba naudokite planet.osm"
msgid "Database offline for maintenance"
msgstr "Duomenų bazė nepasiekiama dėl priežiūros darbų"
@@ -16298,9 +16335,21 @@ msgstr "Mapbox palydovinis"
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap (pritaikyta dviračiams)"
@@ -16440,10 +16489,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -16495,7 +16661,7 @@ msgid "basemap.at"
msgstr "basemap.at"
msgid "Basemap of Austria, based on goverment data."
-msgstr ""
+msgstr "Austrijos bazinis žemėlapis, paremtas valdžios duomenimis."
msgid "basemap.at Orthofoto"
msgstr "basemap.at Orthofoto"
@@ -16648,7 +16814,7 @@ msgid "IBGE federal district"
msgstr ""
msgid "Addresses data from IBGE"
-msgstr ""
+msgstr "Adresų duomenys iš IBGE"
msgid "Rio Mosaic 2013"
msgstr ""
@@ -16860,10 +17026,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -17004,16 +17170,16 @@ msgid "Bavaria (2 m)"
msgstr "Bavarija (2 m)"
msgid "Berlin aerial photograph 2011"
-msgstr ""
+msgstr "Berlyno 2011 m. oro nuotraukos"
msgid "Berlin aerial photograph 2014"
-msgstr ""
+msgstr "Berlyno 2014 m. oro nuotraukos"
msgid "Berlin aerial photograph 2015"
-msgstr ""
+msgstr "Berlyno 2015 m. oro nuotraukos"
msgid "Berlin aerial photograph 2016"
-msgstr ""
+msgstr "Berlyno 2016 m. oro nuotraukos"
msgid "Deutsche Bahn VzG lines Nov 2013"
msgstr ""
@@ -17293,6 +17459,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr "Lodis - Italija"
@@ -17962,7 +18140,7 @@ msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
msgstr ""
msgid "Ukraine - Orthophotomaps 2012"
-msgstr "Ukraina - Ortofotožemėlapiai 2012"
+msgstr ""
msgid "Works only from within Ukraine or with an Ukrainian proxy server."
msgstr ""
@@ -19509,7 +19687,7 @@ msgid "international"
msgstr ""
msgid "seafood"
-msgstr ""
+msgstr "jūros_produktai"
msgid "spanish"
msgstr ""
@@ -20861,7 +21039,7 @@ msgid "Optional crossing attributes:"
msgstr ""
msgid "Pedestrian crossing type"
-msgstr ""
+msgstr "Pėsčiųjų perėjos tipas"
msgid "uncontrolled"
msgstr "nekontroliuojama"
@@ -20982,7 +21160,7 @@ msgid "Second Name"
msgstr ""
msgid "Speed Limit Sign"
-msgstr ""
+msgstr "Greičio apribojimo ženklas"
msgid "Speed Camera"
msgstr "Greičio matuoklis"
@@ -21535,7 +21713,7 @@ msgid "LPG (Liquefied petroleum gas)"
msgstr "LPG (suskystintos naftos dujos)"
msgid "CNG (Compressed Natural Gas)"
-msgstr "CNG (suspaustos gamtinės dujos)"
+msgstr "CNG (suslėgtos gamtinės dujos)"
msgid "Pier"
msgstr "Molas"
@@ -22154,7 +22332,7 @@ msgid "Building"
msgstr "Pastatas"
msgid "Ticket Machine"
-msgstr ""
+msgstr "Bilietų automatas"
msgid "Reference Number"
msgstr "Nuorodos numeris"
@@ -22275,7 +22453,7 @@ msgid "Rooms"
msgstr ""
msgid "Beds"
-msgstr ""
+msgstr "Lovos"
msgid "Motel"
msgstr "Motelis"
@@ -22284,10 +22462,10 @@ msgid "Guest House/Bed & Breakfast"
msgstr "Svečių namai/Nakvynė ir pusryčiai"
msgid "Apartment"
-msgstr ""
+msgstr "Apartamentai"
msgid "Number of apartments"
-msgstr ""
+msgstr "Apartamentų skaičius"
msgid "Chalet"
msgstr "Vasarnamis"
@@ -22305,7 +22483,7 @@ msgid "Access rights"
msgstr ""
msgid "Shower"
-msgstr ""
+msgstr "Dušas"
msgid "seasonal"
msgstr ""
@@ -22347,7 +22525,7 @@ msgid "Restaurant"
msgstr "Restoranas"
msgid "Microbrewery"
-msgstr ""
+msgstr "Mikro alaus darykla"
msgid "Outdoor seating"
msgstr ""
@@ -22362,10 +22540,10 @@ msgid "Mo-Su 12:00-22:00"
msgstr ""
msgid "Fast Food"
-msgstr "Greitas Maistas"
+msgstr "Greitas maistas"
msgid "Food Court"
-msgstr ""
+msgstr "Maisto kiemas"
msgid "Cafe"
msgstr "Kavinė"
@@ -22377,7 +22555,7 @@ msgid "Pub"
msgstr "Aludė"
msgid "Beer Garden"
-msgstr "Aludė lauke (Biergarten)"
+msgstr "Aludė lauke"
msgid "Bar"
msgstr "Baras"
@@ -22504,7 +22682,7 @@ msgid "Information using headphones or a mobile phone."
msgstr "Informacija naudojant ausines ar mobilų telefoną."
msgid "Audioguide via mobile phone?"
-msgstr ""
+msgstr "Audiogidas per mobilų telefoną?"
msgid "Phone number"
msgstr ""
@@ -22552,7 +22730,7 @@ msgid "Beach Resort"
msgstr ""
msgid "Swimming Pool"
-msgstr ""
+msgstr "Plaukimo baseinas"
msgid "Used for the water area only."
msgstr ""
@@ -22640,7 +22818,7 @@ msgid "Artist Name"
msgstr ""
msgid "Studio"
-msgstr ""
+msgstr "Studija"
msgid "audio"
msgstr "garsas"
@@ -23019,7 +23197,7 @@ msgid "pneumatic"
msgstr ""
msgid "electronic"
-msgstr ""
+msgstr "elektroninė"
msgid "mechanical"
msgstr ""
@@ -23065,7 +23243,7 @@ msgid "Shelter"
msgstr ""
msgid "Food Bank"
-msgstr ""
+msgstr "Maisto bankas"
msgid "Toilets/Restrooms"
msgstr "Tualetai/Tualeto kambariai"
@@ -23155,7 +23333,7 @@ msgid "Telephone cards"
msgstr ""
msgid "Internet Cafe"
-msgstr ""
+msgstr "Interneto kavinė"
msgid "Internet Access"
msgstr "Interneto prieiga"
@@ -23318,13 +23496,13 @@ msgid "Lockable"
msgstr ""
msgid "Water Point"
-msgstr ""
+msgstr "Vandens taškas"
msgid "Animal watering place"
-msgstr ""
+msgstr "Gyvulių girdykla"
msgid "Compressed Air"
-msgstr ""
+msgstr "Suslėgtas oras"
msgid "Valves"
msgstr ""
@@ -23345,7 +23523,7 @@ msgid "Advertising Column"
msgstr "Reklamos stulpas"
msgid "Billboard"
-msgstr "Skelbimų lenta"
+msgstr "Reklamos stendas"
msgid "Sports"
msgstr "Sportas"
@@ -23884,7 +24062,7 @@ msgstr ""
msgctxt "building"
msgid "Levels"
-msgstr ""
+msgstr "Lygiai"
msgid "Residential Building"
msgstr "Gyvenamasis pastatas"
@@ -23934,7 +24112,7 @@ msgstr "Pastato dalis"
msgctxt "building"
msgid "Skipped Levels"
-msgstr ""
+msgstr "Praleisti lygiai"
msgid "Skipped height (meters)"
msgstr ""
@@ -24042,7 +24220,7 @@ msgstr ""
msgctxt "content"
msgid "wine"
-msgstr ""
+msgstr "vynas"
msgid "Bunker Silo"
msgstr ""
@@ -24456,7 +24634,7 @@ msgid "reciprocating_engine"
msgstr ""
msgid "steam_generator"
-msgstr ""
+msgstr "garo_generatorius"
msgid "Biogas Power Generator"
msgstr "Biodujų elektros generatorius"
@@ -24492,7 +24670,7 @@ msgid "combustion"
msgstr ""
msgid "steam_turbine"
-msgstr ""
+msgstr "garo_turbina"
msgid "Coal Power Generator"
msgstr "Anglies elektros generatorius"
@@ -25019,15 +25197,15 @@ msgstr ""
msgctxt "power"
msgid "y-frame"
-msgstr ""
+msgstr "y-rėmas"
msgctxt "power"
msgid "x-frame"
-msgstr ""
+msgstr "x-rėmas"
msgctxt "power"
msgid "h-frame"
-msgstr ""
+msgstr "h-rėmas"
msgctxt "power"
msgid "guyed_h-frame"
@@ -25234,40 +25412,40 @@ msgid "Supermarket"
msgstr "Prekybos centras"
msgid "Convenience Store"
-msgstr "Savitarnos Parduotuvė"
+msgstr "Savitarnos parduotuvė"
msgid "Kiosk"
msgstr "Kioskas"
msgid "Bakery"
-msgstr ""
+msgstr "Kepykla"
msgid "Butcher"
msgstr "Mėsininkas"
msgid "Seafood"
-msgstr "Jūrų gėrybės"
+msgstr "Jūros produktai"
msgid "Dairy"
-msgstr ""
+msgstr "Pieno produktai"
msgid "Cheese"
-msgstr ""
+msgstr "Sūris"
msgid "Deli (Fine Food)"
-msgstr ""
+msgstr "Delikatesai"
msgid "Pastry"
-msgstr ""
+msgstr "Kepiniai"
msgid "Confectionery"
-msgstr ""
+msgstr "Saldumynai"
msgid "Tea"
-msgstr ""
+msgstr "Arbata"
msgid "Coffee"
-msgstr ""
+msgstr "Kava"
msgid "Public Market"
msgstr ""
@@ -25276,10 +25454,10 @@ msgid "Organic"
msgstr ""
msgid "Greengrocer"
-msgstr ""
+msgstr "Daržovės ir vaisiai"
msgid "Farm Stand"
-msgstr ""
+msgstr "Ūkininko krautuvėlė"
msgid "Organic/Bio"
msgstr ""
@@ -25288,13 +25466,13 @@ msgid "Fair Trade"
msgstr ""
msgid "Alcohol"
-msgstr ""
+msgstr "Alkoholis"
msgid "Beverages"
-msgstr ""
+msgstr "Gėrimai"
msgid "Wine"
-msgstr ""
+msgstr "Vynas"
msgid "Boutique"
msgstr ""
@@ -25303,43 +25481,43 @@ msgid "Outdoor"
msgstr ""
msgid "Dry Cleaning"
-msgstr ""
+msgstr "Cheminė valykla"
msgid "Laundry"
-msgstr ""
+msgstr "Skalbykla"
msgid "Tailor"
-msgstr ""
+msgstr "Siuvėjas"
msgid "Fabric"
-msgstr ""
+msgstr "Audiniai"
msgid "Electronic"
-msgstr ""
+msgstr "Elektronika"
msgid "Computer"
-msgstr ""
+msgstr "Kompiuteriai"
msgid "Electronics"
-msgstr ""
+msgstr "Elektronika"
msgid "Mobile Phone"
-msgstr ""
+msgstr "Mobilieji telefonai"
msgid "Vacuum Cleaner"
-msgstr ""
+msgstr "Dulkių siurbliai"
msgid "Hifi"
-msgstr ""
+msgstr "Stereoaparatūra"
msgid "Video"
msgstr "Video"
msgid "Video Games"
-msgstr ""
+msgstr "Vaizdo žaidimai"
msgid "Music"
-msgstr ""
+msgstr "Muzika"
msgid "Cash"
msgstr ""
@@ -25354,76 +25532,76 @@ msgid "Money Exchange"
msgstr ""
msgid "Pawnbroker"
-msgstr ""
+msgstr "Lombardas"
msgid "Home decoration"
-msgstr ""
+msgstr "Namų dekoravimas"
msgid "Furniture"
-msgstr ""
+msgstr "Baldai"
msgid "Kitchen"
-msgstr ""
+msgstr "Virtuvė"
msgid "Houseware"
-msgstr ""
+msgstr "Namų apyvokos reikmenys"
msgid "Curtain"
-msgstr ""
+msgstr "Užuolaidos"
msgid "Art"
msgstr ""
msgid "Frame"
-msgstr ""
+msgstr "Rėmeliai"
msgid "Bed"
-msgstr ""
+msgstr "Lovos"
msgid "Interior Decoration"
-msgstr ""
+msgstr "Vidaus dekoravimas"
msgid "Antiques"
-msgstr ""
+msgstr "Antikvaras"
msgid "Printed Material"
-msgstr ""
+msgstr "Spauda"
msgid "Stationery"
-msgstr ""
+msgstr "Raštinės reikmenys"
msgid "Copy Shop"
-msgstr ""
+msgstr "Kopijavimo paslaugos"
msgid "Book Store"
-msgstr ""
+msgstr "Knygynas"
msgid "Newspaper Stand"
-msgstr ""
+msgstr "Spaudos kioskas"
msgid "Ticket"
-msgstr ""
+msgstr "Bilietai"
msgid "For the body"
-msgstr ""
+msgstr "Kūnui"
msgid "Chemist"
-msgstr ""
+msgstr "Švaros prekės"
msgid "Cosmetics"
-msgstr ""
+msgstr "Kosmetika"
msgid "Perfumery"
-msgstr ""
+msgstr "Kvepalai"
msgid "Beauty"
-msgstr ""
+msgstr "Grožis"
msgid "Tobacco"
-msgstr ""
+msgstr "Tabakas"
msgid "Hairdresser/Barber"
-msgstr ""
+msgstr "Kirpykla"
msgid "Female"
msgstr ""
@@ -25435,76 +25613,76 @@ msgid "Unisex"
msgstr ""
msgid "Tattoo"
-msgstr ""
+msgstr "Tatuiruotės"
msgid "Optician"
-msgstr ""
+msgstr "Optikas"
msgid "Hearing Aids"
-msgstr ""
+msgstr "Klausomieji aparatai"
msgid "Medical Supply"
-msgstr ""
+msgstr "Medicinos reikmenys"
msgid "Jewellery"
-msgstr ""
+msgstr "Juvelyriniai dirbiniai"
msgid "Erotic"
-msgstr ""
+msgstr "Erotika"
msgid "Department Store"
-msgstr ""
+msgstr "Universalinė parduotuvė"
msgid "Mall"
-msgstr ""
+msgstr "Parduotuvių rajonas"
msgid "Florist"
-msgstr ""
+msgstr "Gėlininkas"
msgid "Garden Centre"
-msgstr ""
+msgstr "Sodininkystės centras"
msgid "Do-It-Yourself Store"
-msgstr ""
+msgstr "Pasidaryk pats parduotuvė"
msgid "Hardware"
-msgstr ""
+msgstr "Statybinės prekės"
msgid "Paint"
-msgstr ""
+msgstr "Dažai"
msgid "Travel Agency"
-msgstr ""
+msgstr "Kelionių agentūra"
msgid "Musical Instrument"
-msgstr ""
+msgstr "Muzikiniai instrumentai"
msgid "Toys"
-msgstr ""
+msgstr "Žaislai"
msgid "Gift/Souvenir"
-msgstr ""
+msgstr "Dovanos/Suvenyrai"
msgid "Variety Store"
-msgstr ""
+msgstr "Įvairių prekių parduotuvė"
msgid "Bookmaker"
-msgstr ""
+msgstr "Lažybininkas"
msgid "Lottery"
-msgstr ""
+msgstr "Loterija"
msgid "Bag"
-msgstr ""
+msgstr "Rankinės"
msgid "Pet"
-msgstr ""
+msgstr "Naminiai gyvūnai"
msgid "Photo"
-msgstr ""
+msgstr "Fotografija"
msgid "Funeral Directors"
-msgstr ""
+msgstr "Laidojimo paslaugos"
msgid "Vending Machine"
msgstr ""
@@ -25525,7 +25703,7 @@ msgid "cigarettes"
msgstr ""
msgid "coffee"
-msgstr ""
+msgstr "kava"
msgid "condoms"
msgstr ""
@@ -25537,16 +25715,16 @@ msgid "elongated_coin"
msgstr ""
msgid "excrement_bags"
-msgstr ""
+msgstr "išmatų_maišeliai"
msgid "food"
-msgstr ""
+msgstr "maistas"
msgid "milk"
msgstr ""
msgid "newspapers"
-msgstr ""
+msgstr "laikraščiai"
msgid "parking_tickets"
msgstr ""
@@ -25558,7 +25736,7 @@ msgid "parcel_mail_in"
msgstr ""
msgid "photos"
-msgstr ""
+msgstr "nuotraukos"
msgid "public_transport_tickets"
msgstr ""
@@ -25576,10 +25754,10 @@ msgid "telephone_vouchers"
msgstr ""
msgid "toys"
-msgstr ""
+msgstr "žaislai"
msgid "Payment Methods"
-msgstr ""
+msgstr "Apmokėjimo būdai"
msgid "Debit cards"
msgstr "Debeto kortelė"
@@ -25627,7 +25805,7 @@ msgid "Visa"
msgstr ""
msgid "Electronic purses and Charge cards"
-msgstr ""
+msgstr "Elektroninės piniginės ir mokėjimo kortelės"
msgid "Avant (fi)"
msgstr ""
@@ -25682,47 +25860,47 @@ msgstr "Biurai"
msgctxt "office"
msgid "Accountant"
-msgstr ""
+msgstr "Buhalteris"
msgctxt "office"
msgid "Administrative"
-msgstr ""
+msgstr "Administracinis"
msgctxt "office"
msgid "Advertising agency"
-msgstr ""
+msgstr "Reklamos agentūra"
msgctxt "office"
msgid "Architect"
-msgstr ""
+msgstr "Architektas"
msgctxt "office"
msgid "Association"
-msgstr ""
+msgstr "Asociacija"
msgctxt "office"
msgid "Private company"
-msgstr ""
+msgstr "Privati kompanija"
msgctxt "office"
msgid "Educational institution"
-msgstr ""
+msgstr "Švietimo įstaiga"
msgctxt "office"
msgid "Employment agency"
-msgstr ""
+msgstr "Darbo agentūra"
msgctxt "office"
msgid "Estate agent"
-msgstr ""
+msgstr "Nekilnojamojo turto agentas"
msgctxt "office"
msgid "Foundation"
-msgstr ""
+msgstr "Fondas"
msgctxt "office"
msgid "Government"
-msgstr ""
+msgstr "Valdžia"
msgid "ministry"
msgstr ""
@@ -25731,129 +25909,129 @@ msgid "prosecutor"
msgstr ""
msgid "tax"
-msgstr ""
+msgstr "mokesčių"
msgid "register_office"
msgstr ""
msgctxt "office"
msgid "Insurance"
-msgstr ""
+msgstr "Draudimas"
msgctxt "office"
msgid "It specialist"
-msgstr ""
+msgstr "IT specialistas"
msgctxt "office"
msgid "Lawyer"
-msgstr ""
+msgstr "Advokatas"
msgctxt "office"
msgid "Newspaper"
-msgstr ""
+msgstr "Laikraštis"
msgctxt "office"
msgid "Non-governmental organisation (NGO)"
-msgstr ""
+msgstr "Nevyriausybinė organizacija (NVO)"
msgctxt "office"
msgid "Notary"
-msgstr ""
+msgstr "Notaras"
msgctxt "office"
msgid "Political party"
-msgstr ""
+msgstr "Politinė partija"
msgctxt "office"
msgid "Religion"
-msgstr ""
+msgstr "Religija"
msgctxt "office"
msgid "Research"
-msgstr ""
+msgstr "Mokslas"
msgctxt "office"
msgid "Tax advisor"
-msgstr ""
+msgstr "Mokesčių konsultantas"
msgctxt "office"
msgid "Telecommunication"
-msgstr ""
+msgstr "Telekomunikacija"
msgid "Craft"
msgstr "Profesija"
msgid "Beekeeper"
-msgstr ""
+msgstr "Bitininkas"
msgid "Brewery"
-msgstr ""
+msgstr "Alaus darykla"
msgid "Winery"
-msgstr ""
+msgstr "Vyno gamintojas"
msgid "Caterer"
-msgstr ""
+msgstr "Maisto ir gėrimų tiekėjas"
msgid "Upholsterer"
-msgstr ""
+msgstr "Baldų apmušėjas"
msgid "Key cutter"
-msgstr ""
+msgstr "Raktų gamintojas"
msgid "Locksmith"
-msgstr ""
+msgstr "Spynininkas"
msgid "Electrician"
-msgstr ""
+msgstr "Elektrikas"
msgid "Plumber"
-msgstr ""
+msgstr "Santechnikas"
msgid "Hvac"
msgstr ""
msgid "Painter"
-msgstr ""
+msgstr "Dažytojas"
msgid "Tiler"
-msgstr ""
+msgstr "Plytelių klojėjas"
msgid "Window construction"
-msgstr ""
+msgstr "Langų gamyba"
msgid "Carpenter"
-msgstr ""
+msgstr "Dailidė"
msgid "Roofer"
-msgstr ""
+msgstr "Stogdengys"
msgid "Photographer"
-msgstr ""
+msgstr "Fotografas"
msgid "Handicraft"
msgstr "Rankų darbas"
msgid "Pottery"
-msgstr ""
+msgstr "Puodžius"
msgid "Gardener"
-msgstr ""
+msgstr "Sodininkas"
msgid "Shoemaker"
-msgstr ""
+msgstr "Batsiuvys"
msgid "Sawmill"
-msgstr ""
+msgstr "Lentpjūvė"
msgid "Stonemason"
-msgstr ""
+msgstr "Mūrininkas"
msgid "Blacksmith"
-msgstr ""
+msgstr "Kalvis"
msgid "Metal construction"
-msgstr ""
+msgstr "Metalo konstruktorius"
msgid "Geography"
msgstr "Geografija"
@@ -25898,7 +26076,7 @@ msgid "Title or type of protection"
msgstr ""
msgid "Border type"
-msgstr ""
+msgstr "Ribos tipas"
msgid "baseline"
msgstr ""
@@ -26041,16 +26219,16 @@ msgid "Islet"
msgstr "Salelė"
msgid "Reef"
-msgstr ""
+msgstr "Rifas"
msgid "coral"
-msgstr ""
+msgstr "koralinis"
msgid "oyster"
-msgstr ""
+msgstr "austrių"
msgid "rock"
-msgstr ""
+msgstr "uolinis"
msgid "Nature"
msgstr "Gamta"
@@ -26081,7 +26259,7 @@ msgstr "Proskyna"
msgctxt "cutline"
msgid "border"
-msgstr ""
+msgstr "riba"
msgctxt "cutline"
msgid "firebreak"
@@ -26105,7 +26283,7 @@ msgstr ""
msgctxt "cutline"
msgid "section"
-msgstr ""
+msgstr "sekcija"
msgid "Grassland"
msgstr "Pieva"
@@ -26145,13 +26323,13 @@ msgid "An accumulation of loose angular rocks."
msgstr ""
msgid "Shingle"
-msgstr ""
+msgstr "Žvirgždas"
msgid "An accumulation of loose rounded rocks on a beach or riverbed."
-msgstr ""
+msgstr "Palaidų apvalių akmenų sankaupa paplūdimyje ar upės vagoje."
msgid "Fell"
-msgstr ""
+msgstr "Kalvota vieta"
msgid ""
"Bare upper lying uncultivated land principally covered with grass and often "
@@ -26298,7 +26476,7 @@ msgid "peach_trees"
msgstr ""
msgid "tea_plants"
-msgstr ""
+msgstr "arbatmedžiai"
msgid "Vineyard"
msgstr "Vynuogynas"
@@ -26412,7 +26590,7 @@ msgid "Common name abbreviation"
msgstr ""
msgid "Address"
-msgstr ""
+msgstr "Adresas"
msgid "House number"
msgstr "Namo numeris"
@@ -26433,7 +26611,7 @@ msgid "Country code"
msgstr "Šalies kodas"
msgid "Unit/Suite"
-msgstr ""
+msgstr "Sekcija/Butas"
msgid "House name"
msgstr "Namo pavadinimas"
@@ -26644,7 +26822,7 @@ msgid "Contact (Common Schema)"
msgstr "Kontaktai (bendra schema)"
msgid "Email Address"
-msgstr "El. Pašto Adresas"
+msgstr "El. pašto adresas"
msgid "Fax Number"
msgstr "Fakso Numeris"
@@ -26948,13 +27126,13 @@ msgid "Colour of text"
msgstr "Teksto spalva"
msgid "Colour of border/arrow"
-msgstr ""
+msgstr "Rėmelio/rodyklės spalva"
msgid "last way before junction"
msgstr ""
msgid "node of the intersection"
-msgstr ""
+msgstr "sankryžos taškas"
msgid "first way after junction"
msgstr ""
@@ -27199,7 +27377,7 @@ msgid "{0} on suspicious object"
msgstr "{0} ant įtartino objekto"
msgid "natural water used for swimming pool"
-msgstr ""
+msgstr "baseine naudojamas natūralus vanduo"
msgid "sport without physical feature"
msgstr "sportas be fizinės savybės"
@@ -27235,7 +27413,7 @@ msgid "{0} together with {1} and {2}. Remove {1} and {2}"
msgstr "{0} kartu su {1} ir {2}. Pašalinkite {1} ir {2}"
msgid "Different number of lanes in the keys {0} and {1}"
-msgstr ""
+msgstr "Skirtingas juostų skaičius raktuose {0} ir {1}"
msgid "possibly missing {0} tag"
msgstr ""
@@ -27337,10 +27515,10 @@ msgid "{0} is deprecated. Use the {1}: key prefix instead."
msgstr "{0} yra pasenusi. Naudokite {1}: „key“ prefiksą."
msgid "questionable key (ending with a number)"
-msgstr ""
+msgstr "abejotinas raktas (baigiasi skaičiumi)"
msgid "The key {0} has an uncommon value."
-msgstr ""
+msgstr "Raktas {0} turi neeilinę reikšmę."
msgid "misspelled value"
msgstr ""
@@ -27403,7 +27581,7 @@ msgid "{0} on a large area"
msgstr ""
msgid "{0} on a small area"
-msgstr ""
+msgstr "{0} mažam plotui"
msgid "Too large building"
msgstr "Per didelis pastatas"
@@ -27428,6 +27606,7 @@ msgid ""
"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
"instead."
msgstr ""
+"{0} yra žyma vandens keliui. Vandens plotui žymėti naudokite {1} + {2}."
msgid "node connects highway and building"
msgstr ""
@@ -27461,6 +27640,8 @@ msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
msgstr ""
+"„{0}“ reikšmė turėtų būti arba „{1}“, arba „{2}“. Šaligatviams naudokite "
+"„{3}“."
msgid "pedestrian railway crossing without {0}"
msgstr "pėsčiųjų geležinkelio pervaža be {0}"
@@ -27580,10 +27761,10 @@ msgid "''wikipedia''=''language:page title''"
msgstr ""
msgid "wikipedia ''{0}'' language is obsolete, use ''{1}'' instead"
-msgstr ""
+msgstr "wikipedia „{0}“ kalba yra pasenusi, vietoje jos naudokite „{1}“"
msgid "wikipedia ''{0}'' language is invalid, use ''{1}'' instead"
-msgstr ""
+msgstr "wikipedia „{0}“ kalba yra neteisinga, vietoje jos naudokite „{1}“"
msgid "{0} tag should not have URL-encoded values like ''%27''"
msgstr ""
@@ -27600,6 +27781,8 @@ msgstr ""
msgid ""
"wikipedia page title should have spaces instead of underscores (''_''→'' '')"
msgstr ""
+"wikipedia puslapio pavadinimas turi būti su tarpais, o ne pabraukimais "
+"(„_“→„ “)"
msgid "wikipedia language seems to be duplicated, e.g. en:en:Foo"
msgstr ""
@@ -28023,19 +28206,19 @@ msgid "Eps={0}, {1} points, {2} p/km"
msgstr ""
msgid "Fix addresses"
-msgstr ""
+msgstr "Taisyti adresus"
msgid "Show dialog with incomplete addresses"
-msgstr ""
+msgstr "Rodyti dialogo langą su nepilnais adresais"
msgid "Include objects used for guesses"
msgstr "Įtraukti objektus naudotus spėjimams"
msgid "Fix street addresses"
-msgstr ""
+msgstr "Taisyti gatvės adresus"
msgid "Find and fix addresses without (valid) streets."
-msgstr ""
+msgstr "Ieškoti ir taisyti adresus be (tinkamos) gatvės."
msgid "Address Edit"
msgstr "Keisti Adresus"
@@ -28227,10 +28410,10 @@ msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
msgstr ""
msgid "{0} imported images"
-msgstr ""
+msgstr "{0} importuota nuotraukų"
msgid "{0} downloaded images"
-msgstr ""
+msgstr "{0} atsiųsta nuotraukų"
msgid "{0} images in total"
msgstr ""
@@ -28239,7 +28422,7 @@ msgid "{0} images in {1} sequences"
msgstr ""
msgid "Mapillary object layer"
-msgstr ""
+msgstr "Mapillary objektų sluoksnis"
msgid "Displays the layer displaying the map objects detected by Mapillary"
msgstr ""
@@ -28281,7 +28464,7 @@ msgid "Join/unjoin pictures"
msgstr ""
msgid "Submit changeset"
-msgstr ""
+msgstr "Išsiųsti pakeitimą"
msgid "Submit the current changeset"
msgstr ""
@@ -28310,6 +28493,9 @@ msgid ""
"appears for the first time, simply try it again. This might have been an "
"issue with the internet connection."
msgstr ""
+"Įvyko išimtinė situacija mėginant įkelti pakeitimą. Jei tai kartojasi, "
+"praneškite apie klaidą per Žinyno meniu. Jei šis pranešimas rodomas pirmą "
+"kartą, kartokite. Tai galėjo būti problema su interneto ryšiu."
msgid "Upload pictures"
msgstr "Išsiųsti nuotraukas"
@@ -28330,7 +28516,7 @@ msgid "Zoom to the currently selected Mapillary image"
msgstr "Priartinti pažymėtą Mapillary vaizdą"
msgid "Current Mapillary changeset"
-msgstr ""
+msgstr "Dabartinis Mapillary pakeitimas"
msgid "Open Mapillary changeset dialog"
msgstr ""
@@ -28351,7 +28537,7 @@ msgid "Export selected images"
msgstr ""
msgid "Rewrite imported images"
-msgstr ""
+msgstr "Perrašyti importuotas nuotraukas"
msgid "Select a folder"
msgstr ""
@@ -28363,46 +28549,46 @@ msgid "Select a directory"
msgstr ""
msgid "Speed limit"
-msgstr ""
+msgstr "Greičio apribojimas"
msgid "Give way"
msgstr "Duoti kelią"
msgid "No entry"
-msgstr ""
+msgstr "Įvažiuoti draudžiama"
msgid "Intersection danger"
-msgstr ""
+msgstr "Sankryžos įspėjimas"
msgid "Mandatory direction (any)"
-msgstr ""
+msgstr "Privaloma kryptis (bet kokia)"
msgid "Uneven road"
msgstr "Nelygus kelias"
msgid "No parking"
-msgstr ""
+msgstr "Sustoti draudžiama"
msgid "No overtaking"
-msgstr ""
+msgstr "Lenkti draudžiama"
msgid "Pedestrian crossing"
-msgstr ""
+msgstr "Pėsčiųjų perėja"
msgid "No turn"
-msgstr ""
+msgstr "Sukti draudžiama"
msgid "Years"
-msgstr ""
+msgstr "Metai"
msgid "Months"
-msgstr ""
+msgstr "Mėnesiai"
msgid "Days"
-msgstr ""
+msgstr "Dienos"
msgid "Imported images"
-msgstr ""
+msgstr "Importuotos nuotraukos"
msgid "Mapillary filter"
msgstr "Mapillary filtras"
@@ -28411,16 +28597,16 @@ msgid "Open Mapillary filter dialog"
msgstr "Atverti Mapillary filtro dialogo langą"
msgid "Not older than: "
-msgstr ""
+msgstr "Ne senesnės, nei: "
msgid "Downloaded images"
-msgstr ""
+msgstr "Atsiųstos nuotraukos"
msgid "Only images with signs"
-msgstr ""
+msgstr "Tik nuotraukas su ženklais"
msgid "Choose signs"
-msgstr ""
+msgstr "Parinkti ženklus"
msgid "Mapillary history"
msgstr "Mapillary istorija"
@@ -28586,13 +28772,16 @@ msgid "Tag conflict"
msgstr ""
msgid "Key copied to clipboard"
-msgstr ""
+msgstr "Raktas nukopijuotas į iškarpinę"
msgid ""
"The Mapillary plugin now uses a separate panel to display extra information "
"(like the image key) and actions for the currently selected Mapillary image "
"(like viewing it in a browser)."
msgstr ""
+"Mapillary papildinys dabar naudoja atskirą skydelį papildomos informacijos "
+"(pvz., vaizdo rakto) rodymui ir veiksmams su dabar pažymėtu Mapillary vaizdu "
+"(pvz., peržiūra naršyklėje)."
msgid ""
"It can be activated by clicking the left button at the bottom of this "
@@ -28609,7 +28798,7 @@ msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
msgid "Show detections on top of image"
-msgstr ""
+msgstr "Rodyti aptikimus ant vaizdo"
msgid "View in browser"
msgstr ""
@@ -28621,19 +28810,19 @@ msgid "Add Mapillary tag"
msgstr ""
msgid "Image detections"
-msgstr ""
+msgstr "Vaizdų aptikimai"
msgid "Image actions"
-msgstr ""
+msgstr "Vaizdo veiksmai"
msgid "Image key"
-msgstr ""
+msgstr "Vaizdo raktas"
msgid "Sequence key"
-msgstr ""
+msgstr "Sekos raktas"
msgid "{0} detections"
-msgstr ""
+msgstr "{0} aptikimai"
msgid "image has no key"
msgstr ""
@@ -28834,7 +29023,7 @@ msgid "Display clock in 12h mode."
msgstr "Rodyti 12-os valandų laikrodį."
msgid "Choose key"
-msgstr ""
+msgstr "Pasirinkite raktą"
msgid "apply {0}"
msgstr "pritaikyti {0}"
@@ -29272,8 +29461,8 @@ msgstr ""
msgid "Name:"
msgstr "Vardas:"
-msgid "updated building info"
-msgstr "atnaujinta pastatų informacija"
+msgid "update building info"
+msgstr ""
msgid "Tag Element"
msgstr ""
@@ -29299,7 +29488,10 @@ msgstr "Ploto parinkiklis"
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -29402,6 +29594,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr "Derinimas"
@@ -30905,6 +31103,8 @@ msgid ""
"Syntax exception in access ruleset:\n"
"{0}"
msgstr ""
+"Sintaksės išimtinė situacija prieigos taisyklėje:\n"
+"{0}"
msgid ""
"File not found:\n"
@@ -31427,7 +31627,7 @@ msgid "Display non-geotagged photos"
msgstr ""
msgid "Imported Images"
-msgstr ""
+msgstr "Importuotos nuotraukos"
msgid "Next image"
msgstr ""
@@ -31845,7 +32045,7 @@ msgid "Maximum cache size (MB)"
msgstr ""
msgid "Maximum cache age (days)"
-msgstr ""
+msgstr "Maksimalus podėlio amžius (dienomis)"
msgid "Source text"
msgstr ""
@@ -31906,6 +32106,7 @@ msgstr ""
msgid "Maximum age of each cached file in days. Default is 100"
msgstr ""
+"Maksimalus kiekvieno failo podėlyje amžius dienomis. Numatytoji reikšmė 100"
msgid "Data source text. Default is Landsat."
msgstr ""
@@ -32179,7 +32380,7 @@ msgid ""
msgstr ""
msgid "OSM Server Files o5m compressed"
-msgstr ""
+msgstr "OSM serverio failai suspausti o5m"
msgid "Invalid changeset id: {0}"
msgstr "Neteisingas pakeitimo id: {0}"
@@ -32281,7 +32482,7 @@ msgid "Update the selected modules"
msgstr ""
msgid "Please restart JOSM to activate the downloaded modules."
-msgstr ""
+msgstr "Paleiskite JOSM iš naujo atsiųstiems moduliams aktyvuoti."
msgid ""
"All installed modules are up to date. JOSM does not have to download newer "
@@ -32681,7 +32882,7 @@ msgid "Firefox executable"
msgstr ""
msgid "OSM Server Files pbf compressed"
-msgstr ""
+msgstr "OSM serverio failai suspausti pbf"
msgid "Download PBF"
msgstr ""
@@ -32999,7 +33200,7 @@ msgid "coordinates"
msgstr "koordinatės"
msgid "Latitude and longitude"
-msgstr ""
+msgstr "Platuma ir ilguma"
msgid "Edit Image Coordinates"
msgstr ""
@@ -33343,6 +33544,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -33389,6 +33598,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -33409,6 +33624,9 @@ msgid ""
msgstr ""
"Patikrinti ar maršruto ryšiai yra suderinami su viešojo transporto 2 versija"
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -33423,7 +33641,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33802,7 +34033,7 @@ msgid "Move tags from ways to relation"
msgstr ""
msgid "Enter admin level and name for the border relation:"
-msgstr ""
+msgstr "Įveskite administracinį lygį ir vardą ribos ryšiui:"
msgid "Admin level"
msgstr ""
@@ -34633,6 +34864,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -34657,6 +34891,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
@@ -34982,7 +35225,7 @@ msgid "Select a signing key from your keyring-file:"
msgstr ""
msgid "Don''t ask again for the key"
-msgstr ""
+msgstr "Daugiau neklausti rakto"
msgid "Use a random key from this list"
msgstr ""
@@ -35060,10 +35303,10 @@ msgid "Choose Bitlength (Strength):"
msgstr ""
msgid "Encryption algorithm to protect private key:"
-msgstr ""
+msgstr "Šifravimo algoritmas privačiojo rakto apsaugojimui:"
msgid "Choose an expiry date for the key:"
-msgstr ""
+msgstr "Pasirinkite rakto galiojimo datą:"
msgid "Create a new signing key"
msgstr ""
@@ -36202,7 +36445,7 @@ msgid "Remove Video"
msgstr "Pašalinti Video"
msgid "removes current video from layer"
-msgstr ""
+msgstr "pašalina dabartinį video iš sluoksnio"
msgid "Play/Pause"
msgstr "Groti/Pauzė"
@@ -36284,6 +36527,9 @@ msgid ""
"correctly installed on your system. Its architecture (32/64 bits) must also "
"be the same as the JRE that runs JOSM."
msgstr ""
+"VLC biblioteka neteisingai inicijuota. Patikrinkite, kad VLC {0} yra "
+"teisingai įdiegta sistemoje. Jos architektūra (32/64 bitų) privalo sutapti "
+"su JRE, naudojamo JOSM paleidimui, architektūra."
msgid "Jump to"
msgstr "Peršokti į"
diff --git a/i18n/po/lv.po b/i18n/po/lv.po
index 33627b2..0d0d37c 100644
--- a/i18n/po/lv.po
+++ b/i18n/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2012-10-03 22:16+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Latvian <lv at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-07-03 04:51+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:52+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: lv\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2414,6 +2414,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2510,6 +2513,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2687,6 +2696,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7849,6 +7861,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7885,6 +7900,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13265,6 +13283,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14857,9 +14878,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14999,10 +15032,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15419,10 +15569,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15848,6 +15998,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27761,7 +27923,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27788,7 +27950,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27891,6 +28056,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31780,6 +31951,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31826,6 +32005,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31845,6 +32030,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31859,7 +32047,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33063,6 +33264,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33087,6 +33291,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/mk.po b/i18n/po/mk.po
index cbf22f2..e123481 100644
--- a/i18n/po/mk.po
+++ b/i18n/po/mk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2013-05-11 04:37+0000\n"
"Last-Translator: Bojan Jankuloski <bojan.jankuloski at gmail.com>\n"
"Language-Team: Macedonian <mk at 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 % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-"X-Launchpad-Export-Date: 2017-07-03 04:52+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:53+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: mk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2406,6 +2406,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2502,6 +2505,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2679,6 +2688,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7842,6 +7854,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7878,6 +7893,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13255,6 +13273,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14847,9 +14868,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14989,10 +15022,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15409,10 +15559,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15838,6 +15988,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27751,7 +27913,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27778,7 +27940,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27881,6 +28046,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31770,6 +31941,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31816,6 +31995,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31835,6 +32020,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31849,7 +32037,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33053,6 +33254,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33077,6 +33281,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/mr.po b/i18n/po/mr.po
index 19f4695..1d844ab 100644
--- a/i18n/po/mr.po
+++ b/i18n/po/mr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2015-05-24 23:45+0000\n"
"Last-Translator: Singleton <singleton47+ubuntuone at live.com>\n"
"Language-Team: Marathi <mr at 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-07-03 04:52+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:54+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: mr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2430,6 +2430,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "गाळा"
@@ -2526,6 +2529,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2704,6 +2713,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7867,6 +7879,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7903,6 +7918,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "किमान अक्षांश"
@@ -13290,6 +13308,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14882,9 +14903,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -15024,10 +15057,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15444,10 +15594,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15873,6 +16023,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27786,7 +27948,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27813,7 +27975,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27916,6 +28081,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31805,6 +31976,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31851,6 +32030,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31870,6 +32055,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31884,7 +32072,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33088,6 +33289,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33112,6 +33316,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/ms.po b/i18n/po/ms.po
index 56981fa..8baa18a 100644
--- a/i18n/po/ms.po
+++ b/i18n/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2011-12-11 22:14+0000\n"
"Last-Translator: abuyop <Unknown>\n"
"Language-Team: Malay <ms at 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-07-03 04:53+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:54+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: ms\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2403,6 +2403,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2499,6 +2502,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2676,6 +2685,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7839,6 +7851,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7875,6 +7890,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13251,6 +13269,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14843,9 +14864,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14985,10 +15018,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15405,10 +15555,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15834,6 +15984,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27747,7 +27909,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27774,7 +27936,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27877,6 +28042,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31766,6 +31937,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31812,6 +31991,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31831,6 +32016,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31845,7 +32033,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33049,6 +33250,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33073,6 +33277,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/nb.po b/i18n/po/nb.po
index d076f4f..0f36fa2 100644
--- a/i18n/po/nb.po
+++ b/i18n/po/nb.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
-"PO-Revision-Date: 2017-02-21 09:17+0000\n"
-"Last-Translator: Syver Stensholt <sssandum at gmail.com>\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
+"PO-Revision-Date: 2017-07-25 19:26+0000\n"
+"Last-Translator: Kristoffer Hagen <Unknown>\n"
"Language-Team: Norwegian Bokmal <nb at li.org>\n"
"MIME-Version: 1.0\n"
"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-07-03 04:54+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:55+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: nb\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -825,7 +825,7 @@ msgid "Merge the current layer into another layer"
msgstr "Flett det gjeldende laget inn i et annet lag"
msgid "{0} completed in {1}"
-msgstr ""
+msgstr "{0} fullført i {1}"
msgid "Merging layers with different upload policies"
msgstr "Fletter lag med forskjellige opplastningspoliser"
@@ -853,6 +853,8 @@ msgid ""
"Please select at least two nodes to merge or one node that is close to "
"another node."
msgstr ""
+"Vennligst velg minst to noder som vil slås sammen eller en node som er nær "
+"en annen node."
msgid "Abort Merging"
msgstr "Avbryt fletting"
@@ -1022,6 +1024,8 @@ msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
msgstr ""
+"Kan ikke åpne URL ''{0}''<br>Den følgende nedlastingsoperasjonen akseptere "
+"følgende URL-mønstre:<br>{1}"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1056,6 +1060,9 @@ msgid ""
"undesirable results when doing rectangular alignments.<br>Change your "
"projection to get rid of this warning.<br>Do you want to continue?</html>"
msgstr ""
+"<html>Du benytter projeksjonen EPSG:4326 som kan medføre <br>uønskede "
+"resultater ved rektangulære justeringer.<br>Bytt projeksjon for å fjerne "
+"dette varselet.<br>Vil du fortsette?</html>"
msgid "Orthogonalize"
msgstr "Vinkle (90)"
@@ -1253,10 +1260,10 @@ msgstr ""
"Velg alle data i lag som ikke er slettet. OBS uferdige data blir også valgt."
msgid "Non-branching way sequences"
-msgstr ""
+msgstr "Forgreningsfrie linjesekvenser"
msgid "Select non-branching sequences of ways"
-msgstr ""
+msgstr "Velg forgreningsfrie linjesekvenser"
msgid "Load Session"
msgstr "Åpne Økt"
@@ -1307,7 +1314,7 @@ msgid "Layers"
msgstr "Lag"
msgid "No exporter for this layer"
-msgstr ""
+msgstr "Ingen eksportør for dette laget"
msgid "Show Status Report"
msgstr "Vis statusrapport"
@@ -1370,11 +1377,13 @@ msgid "Split a way at the selected node."
msgstr "Splitt en linje i den valgte noden."
msgid "Cannot split since another split operation is already in progress"
-msgstr ""
+msgstr "Kan ikke dele fordi en annen deleoperasjon allerede kjører"
msgid ""
"The current selection cannot be used for splitting - no node is selected."
msgstr ""
+"Det nåværende utvalget kan ikke bli benyttet for deling - ingen node er "
+"valgt."
msgid "The selected nodes do not share the same way."
msgstr "Valgte noder er ikke på samme linje."
@@ -1396,7 +1405,7 @@ msgstr[1] ""
"Mer enn én linje bruker de valgte nodene. Velg aktuell linje i tillegg."
msgid "Which way segment should reuse the history of {0}?"
-msgstr ""
+msgstr "Hvilket veisegment skal benytte historikken til {0}?"
msgid " [id: {0}]"
msgstr " [id: {0}]"
@@ -1426,11 +1435,11 @@ msgstr ""
msgid "Split way {0} into {1} part"
msgid_plural "Split way {0} into {1} parts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Del vei {0} inn i {1} del"
+msgstr[1] "Del vei {0} inn i {1} deler"
msgid "Discourage upload"
-msgstr ""
+msgstr "Fraråde opplasting"
msgid "UnGlue Ways"
msgstr "Fjern knytning til linjer"
@@ -2483,6 +2492,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Filter"
@@ -2580,6 +2592,12 @@ msgstr "alle lukkede veier"
msgid "object without useful tags"
msgstr "objekter uten nyttige egenskaper"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "metadata"
@@ -2761,6 +2779,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7968,6 +7989,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -8004,6 +8028,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "min. breddegrad"
@@ -13471,6 +13498,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -15073,9 +15103,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -15215,10 +15257,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15635,10 +15794,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -16064,6 +16223,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -28004,7 +28175,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -28031,7 +28202,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -28134,6 +28308,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -32058,6 +32238,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -32104,6 +32292,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -32123,6 +32317,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -32137,7 +32334,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33345,6 +33555,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33369,6 +33582,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/nds.po b/i18n/po/nds.po
index 0cea3c0..757af7f 100644
--- a/i18n/po/nds.po
+++ b/i18n/po/nds.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2009-11-29 09:01+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: German, Low <nds at 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-07-03 04:53+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:55+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2403,6 +2403,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2499,6 +2502,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2676,6 +2685,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7838,6 +7850,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7874,6 +7889,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13250,6 +13268,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14842,9 +14863,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14984,10 +15017,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15404,10 +15554,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15833,6 +15983,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27746,7 +27908,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27773,7 +27935,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27876,6 +28041,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31765,6 +31936,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31811,6 +31990,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31830,6 +32015,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31844,7 +32032,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33048,6 +33249,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33072,6 +33276,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/nl.po b/i18n/po/nl.po
index a1db0a9..504c40c 100644
--- a/i18n/po/nl.po
+++ b/i18n/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2017-07-02 11:29+0000\n"
"Last-Translator: DiGro <Unknown>\n"
"Language-Team: Dutch\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-07-03 04:40+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:40+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: nl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2649,6 +2649,9 @@ msgstr "Syntaxis voor zoeken"
msgid "Invalid search expression"
msgstr "Ongeldige zoekexpressie"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Filteren"
@@ -2752,6 +2755,12 @@ msgstr "alle gesloten wegen"
msgid "object without useful tags"
msgstr "object zonder nuttige tags"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "metadata"
@@ -2947,6 +2956,9 @@ msgstr "Positief geheel getal verwacht"
msgid "Range of numbers expected"
msgstr "Een bereik van getallen werd verwacht"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Onverwacht teken. {0} werd verwacht, {1} werd gevonden"
@@ -8621,6 +8633,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Fout aantal argumenten voor bladwijzer"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Fout bij het inlezen van bladwijzer: %s"
@@ -8663,6 +8678,9 @@ msgstr "De huidige geselecteerde bladwijzers verwijderen"
msgid "Rename the currently selected bookmark"
msgstr "De huidige geselecteerde bladwijzers hernoemen"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "min lat"
@@ -14757,6 +14775,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Informatie over gebruiker lezen ..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Starten met uploaden van één verzoek per primitief ..."
@@ -16636,9 +16657,21 @@ msgstr "Mapbox Satellite"
msgid "DigitalGlobe Premium Imagery"
msgstr "DigitalGlobe Premium Imagery"
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr "DigitalGlobe Standard Imagery"
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -16786,11 +16819,128 @@ msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
"Sentinel-2-afbeeldingen van Enderby Land en Kemp Coast (ware kleuren)"
-msgid "IGN Argentina (TMS)"
-msgstr "IGN Argentinië (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
-msgid "IGN Argentina (WMS)"
-msgstr "IGN Argentinië (WMS)"
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
+msgstr ""
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI zwart-wit 2.5m"
@@ -17223,11 +17373,11 @@ msgstr "SDFE Cadastral Parcels INSPIRE View"
msgid "SDFE DTK Kort25"
msgstr "SDFE DTK Kort25"
-msgid "SDFE Terræn Skyggekort (40 cm)"
-msgstr "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
+msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
-msgstr "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
+msgstr ""
msgid "SDFE Skærmkort"
msgstr "SDFE Skærmkort"
@@ -17690,6 +17840,18 @@ msgstr "OSMIE Dail Election Areas"
msgid "OSMIE T.ie Land not in Counties"
msgstr "OSMIE T.ie Land niet in Counties"
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr "Lodi - Italië"
@@ -30297,8 +30459,8 @@ msgstr "Bron:"
msgid "Name:"
msgstr "Naam:"
-msgid "updated building info"
-msgstr "informatie voor gebouwen bijgewerkt"
+msgid "update building info"
+msgstr ""
msgid "Tag Element"
msgstr "Tag voor element"
@@ -30325,8 +30487,11 @@ msgstr "Gebiedsselectie"
msgid "Trying to detect an area at:"
msgstr "Proberen om een gebied te detecteren op:"
-msgid "Created area"
-msgstr "Gemaakt gebied"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
+msgstr ""
msgid "Add address"
msgid_plural "Add addresses"
@@ -30446,6 +30611,12 @@ msgstr ""
"Probeer automatisch het juiste adres te vinden met de plug-in Austria "
"Address Helper"
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr "Foutopsporing"
@@ -34649,6 +34820,14 @@ msgstr "Afdrukken is mislukt."
msgid "Repeat last fix"
msgstr "Laatste reparatie herhalen"
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr "Wilt u de rotonde rond maken?"
@@ -34698,6 +34877,12 @@ msgstr "Hoe wilt u verder gaan?"
msgid "PT_Assistant Proceed Request"
msgstr "Verzoek door te gaan met PT_Assistant"
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr "PT: Halte_positie is geen deel van een weg"
@@ -34719,6 +34904,9 @@ msgid ""
msgstr ""
"Controleren of routerelaties overeenkomen met openbaar vervoer versie 2"
+msgid "PT: Relation member roles do not match tags"
+msgstr "PT: Rol van het lid van de relatie komt niet overene met de tags"
+
msgid "Fix error"
msgstr "Fout oplossen"
@@ -34735,8 +34923,21 @@ msgstr ""
"PT: Gaten in route kunnen verminderen bij sorteren van leden. Nadere "
"specificaties zijn vereist"
-msgid "PT: Relation member roles do not match tags"
-msgstr "PT: Rol van het lid van de relatie komt niet overene met de tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
+msgstr ""
msgid "PT: Route should start and end with a stop_position"
msgstr "PT: Route zou moeten beginnen en eindigen met een stop_position"
@@ -36013,6 +36214,9 @@ msgstr "Plug-in Tofix inschakelen"
msgid "Auto delete layer"
msgstr "Laag automatisch verwijderen"
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr "Het keuzevak selecteren om:"
@@ -36037,6 +36241,15 @@ msgstr "<html><a href=\"\">Takenlijst</a></html>"
msgid "Select a task ..."
msgstr "Een taak selecteren ..."
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr "Downloadgebied instellen (m²)"
@@ -38090,3 +38303,9 @@ msgstr "Begin te rijden"
msgid "Drive a race car on this layer"
msgstr "Rijd met een raceauto over deze laag"
+
+#~ msgid "SDFE Terræn Skyggekort (40 cm)"
+#~ msgstr "SDFE Terræn Skyggekort (40 cm)"
+
+#~ msgid "SDFE Overflade Skyggekort (40 cm)"
+#~ msgstr "SDFE Overflade Skyggekort (40 cm)"
diff --git a/i18n/po/nn.po b/i18n/po/nn.po
index af72cd7..5fa4967 100644
--- a/i18n/po/nn.po
+++ b/i18n/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2009-07-15 12:49+0000\n"
"Last-Translator: Skippern <Unknown>\n"
"Language-Team: Norwegian Nynorsk <nn at 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-07-03 04:54+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:55+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: nn\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2403,6 +2403,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2499,6 +2502,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2676,6 +2685,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7839,6 +7851,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7875,6 +7890,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13251,6 +13269,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14843,9 +14864,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14985,10 +15018,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15405,10 +15555,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15834,6 +15984,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27747,7 +27909,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27774,7 +27936,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27877,6 +28042,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31766,6 +31937,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31812,6 +31991,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31831,6 +32016,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31845,7 +32033,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33049,6 +33250,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33073,6 +33277,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/oc.po b/i18n/po/oc.po
index 9e4a645..4579639 100644
--- a/i18n/po/oc.po
+++ b/i18n/po/oc.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2012-10-03 22:14+0000\n"
"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary at yahoo.fr>\n"
"Language-Team: Occitan (post 1500) <oc at 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-07-03 04:54+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:56+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2410,6 +2410,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Filtrar"
@@ -2506,6 +2509,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2683,6 +2692,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7846,6 +7858,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7882,6 +7897,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "lat min"
@@ -13260,6 +13278,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14852,9 +14873,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14994,10 +15027,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15414,10 +15564,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15843,6 +15993,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27756,7 +27918,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27783,7 +27945,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27886,6 +28051,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31775,6 +31946,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31821,6 +32000,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31840,6 +32025,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31854,7 +32042,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33058,6 +33259,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33082,6 +33286,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/pa.po b/i18n/po/pa.po
index 7713e4e..739a3a3 100644
--- a/i18n/po/pa.po
+++ b/i18n/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2011-05-06 15:52+0000\n"
"Last-Translator: A S Alam <aalam at users.sf.net>\n"
"Language-Team: Punjabi <pa at 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-07-03 04:55+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:56+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: pa\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2403,6 +2403,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2499,6 +2502,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2676,6 +2685,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7839,6 +7851,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7875,6 +7890,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13251,6 +13269,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14843,9 +14864,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14985,10 +15018,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15405,10 +15555,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15834,6 +15984,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27747,7 +27909,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27774,7 +27936,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27877,6 +28042,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31766,6 +31937,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31812,6 +31991,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31831,6 +32016,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31845,7 +32033,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33049,6 +33250,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33073,6 +33277,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/pl.po b/i18n/po/pl.po
index ec69f53..037c904 100644
--- a/i18n/po/pl.po
+++ b/i18n/po/pl.po
@@ -8,17 +8,17 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
-"PO-Revision-Date: 2017-07-02 12:21+0000\n"
-"Last-Translator: Piotr Sokół <Unknown>\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
+"PO-Revision-Date: 2017-07-30 01:06+0000\n"
+"Last-Translator: Daniel Koć <daniel at xn--ko-wla.pl>\n"
"Language-Team: polski <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-07-03 04:56+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:57+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: pl\n"
"X-Poedit-Bookmarks: 1098,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
"X-Poedit-Basepath: /home/mfloryan/dev/josm/i18n\n"
@@ -2635,17 +2635,20 @@ msgid "MapCSS selector"
msgstr "Selektor MapCSS"
msgid "Selection settings"
-msgstr ""
+msgstr "Ustawienia zaznaczania"
msgid "Additional settings"
-msgstr ""
+msgstr "Ustawienia dodatkowe"
msgid "Search syntax"
-msgstr ""
+msgstr "Składnia wyszukiwania"
msgid "Invalid search expression"
msgstr "Niepoprawne wyrażenie regularne."
+msgid "Search by preset"
+msgstr "Szukaj według szablonu"
+
msgid "Filter"
msgstr "Filtr"
@@ -2667,7 +2670,7 @@ msgstr ""
" {0}"
msgid "Search hints"
-msgstr ""
+msgstr "Podpowiedzi"
msgid "basics"
msgstr "podstawowe"
@@ -2748,6 +2751,13 @@ msgstr "wszystkie zamknięte linie"
msgid "object without useful tags"
msgstr "obiekt bez użytecznych znaczników"
+msgid "all objects that use the address preset"
+msgstr "wszystkie obiekty używające szablonu adresu"
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+"wszystkie obiekty używające dowolnego szablonu z grupy Geografia/Natura"
+
msgid "metadata"
msgstr "metadane"
@@ -2942,6 +2952,9 @@ msgstr "Oczekiwano dodatniej liczby całkowitej"
msgid "Range of numbers expected"
msgstr "Spodziewane: zakres liczbowy"
+msgid "Unknown preset name: "
+msgstr "Nieznana nazwa szablonu: "
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Niespodziewany token. Spodziewano się {0}, znaleziono {1}."
@@ -6037,7 +6050,7 @@ msgid "Keep their deleted state"
msgstr "Zachowaj ich stan usunięcia"
msgid "Undecide conflict between deleted state"
-msgstr ""
+msgstr "Nie rozwiązuj konfliktu między stanami usunięcia"
msgid "Role"
msgstr "Rola"
@@ -7875,7 +7888,7 @@ msgstr[1] ", {0} nieprzypisane"
msgstr[2] ", {0} nieprzypisanych"
msgid "Select objects for which to change tags."
-msgstr "Proszę zaznaczyć obiekty, którym zmienić znaczniki"
+msgstr "Proszę zaznaczyć obiekty, którym chcesz zmienić znaczniki"
msgid "Tags/Memberships"
msgstr "Znaczniki/członkowie"
@@ -8522,6 +8535,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Nieprawidłowa liczba parametrów dla zakładki"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Błąd odczytywania wpisu zakładki: %s"
@@ -8561,6 +8577,9 @@ msgstr "Usuwa zaznaczone zakładki"
msgid "Rename the currently selected bookmark"
msgstr "Zmienia nazwę zakładki"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "min. szerokość"
@@ -8954,7 +8973,7 @@ msgid "B"
msgstr "B"
msgid "Editor"
-msgstr ""
+msgstr "Edytor"
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
@@ -10652,7 +10671,7 @@ msgid "Velocity, {0}"
msgstr "Prędkość, {0}"
msgid "Audio files (*.wav, *.mp3, *.aac, *.aif, *.aiff)"
-msgstr ""
+msgstr "Pliki dźwiękowe (*.wav, *.mp3, *.aac, *.aif, *.aiff)"
msgid "Import Audio"
msgstr "Importuj dźwięk"
@@ -11349,7 +11368,7 @@ msgid "URL / File:"
msgstr "Adres URL / plik:"
msgid "active"
-msgstr "Aktywne"
+msgstr "aktywny"
msgid "Map paint style file (*.xml, *.mapcss, *.zip)"
msgstr "Plik stylu rysowania mapy (*.xml, *.mapcss, *.zip)"
@@ -14409,6 +14428,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Wczytywanie informacji o użytkowniku..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Rozpoczęcie wysyłania, jedno żadanie na element ..."
@@ -15402,7 +15424,7 @@ msgstr ""
"Proszę spróbować później.</html>"
msgid "no error message available"
-msgstr ""
+msgstr "brak dostępnego komunikatu błędu"
msgid ""
"<html>Communication with the OSM server ''{0}''failed. The server "
@@ -16073,7 +16095,7 @@ msgstr "powiat/hrabstwo"
msgctxt "Place type"
msgid "hamlet"
-msgstr "przysiółek"
+msgstr "przysiółek/osada"
msgctxt "Place type"
msgid "suburb"
@@ -16223,9 +16245,21 @@ msgstr "Mapbox - zdjęcia satelitarne"
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -16365,10 +16399,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -16785,10 +16936,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -17214,6 +17365,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr "Lodi - Włochy"
@@ -19162,7 +19325,7 @@ msgstr ""
"jazdy po drogach i wszystko poniżej"
msgid "horrible"
-msgstr "okropna"
+msgstr "fatalna"
msgid "Off-Road: heavy duty off-road vehicle"
msgstr ""
@@ -19170,7 +19333,7 @@ msgstr ""
"wszystko poniżej"
msgid "very_horrible"
-msgstr "bardzo okropna"
+msgstr "bardziej niż fatalna"
msgid "Specialized off-road: tractor, ATV"
msgstr ""
@@ -19296,7 +19459,7 @@ msgstr "Elektryfikacja"
msgctxt "electrified"
msgid "contact_line"
-msgstr ""
+msgstr "linia napowietrzna"
msgctxt "electrified"
msgid "no"
@@ -19308,7 +19471,7 @@ msgstr "tak"
msgctxt "electrified"
msgid "rail"
-msgstr ""
+msgstr "dodatkowa szyna"
msgid "Voltage in Volts (V)"
msgstr "Napięcie w woltach (V)"
@@ -20178,7 +20341,7 @@ msgid "Destination"
msgstr "Miejsce docelowe"
msgid "Destination reference"
-msgstr ""
+msgstr "Oznaczenie drogi do miejsca docelowego"
msgid "Placement"
msgstr "Położenie"
@@ -20315,7 +20478,7 @@ msgid "parking_aisle"
msgstr "uliczka parkingowa"
msgid "drive-through"
-msgstr "przejazd (drive-through)"
+msgstr "drive-through (zakupy)"
msgid "emergency_access"
msgstr "droga pożarowa"
@@ -20518,7 +20681,7 @@ msgid "Ford"
msgstr "Bród"
msgid "stepping_stones"
-msgstr ""
+msgstr "przejście po kamieniach"
msgid "Ways"
msgstr "Drogi"
@@ -20527,37 +20690,37 @@ msgid "Track"
msgstr "Droga polna lub leśna"
msgid "Tracktype"
-msgstr "Typ drogi"
+msgstr "Rodzaj utwardzenia"
msgid "grade1"
msgstr "1 stopnia"
msgid "Solid: paved or heavily compacted hardcore surface"
-msgstr ""
+msgstr "Twarda lub bardzo dobrze utwardzona"
msgid "grade2"
msgstr "2 stopnia"
msgid "Mostly Solid: gravel/rock with some soft material mixed in"
-msgstr ""
+msgstr "Utwardzona tłuczniem z niewielką domieszką miękkich materiałów"
msgid "grade3"
msgstr "3 stopnia"
msgid "Even mixture of hard and soft materials"
-msgstr ""
+msgstr "Podobna ilość tłucznia, co materiałów miękkich"
msgid "grade4"
msgstr "4 stopnia"
msgid "Mostly Soft: soil/sand/grass with some hard material mixed in"
-msgstr ""
+msgstr "Ziemia/piach/trawa - z domieszką twardych materiałów"
msgid "grade5"
msgstr "5 stopnia"
msgid "Soft: soil/sand/grass"
-msgstr ""
+msgstr "Ziemia/piach/trawa - bez dodatku materiałów twardych"
msgid "MTB Scale"
msgstr "Skala MTB"
@@ -21233,7 +21396,7 @@ msgid "oxbow"
msgstr "starorzecze"
msgid "pond"
-msgstr "miejsce poboru wody"
+msgstr "staw"
msgid "reservoir"
msgstr "zbiornik"
@@ -21849,7 +22012,7 @@ msgid "Wash"
msgstr "Myjnia samochodowa"
msgid "Self Service"
-msgstr ""
+msgstr "Samoobsługa"
msgid "Car Dealer"
msgstr "Dealer samochodowy"
@@ -21868,13 +22031,13 @@ msgid "dealer"
msgstr ""
msgid "repair"
-msgstr ""
+msgstr "naprawa"
msgid "parts"
-msgstr ""
+msgstr "części"
msgid "tyres"
-msgstr ""
+msgstr "opony"
msgid "Parts"
msgstr "Części zamienne"
@@ -22160,7 +22323,7 @@ msgid "Taxiway"
msgstr "Droga kołowania"
msgid "Holding Position"
-msgstr ""
+msgstr "Punkt oczekiwania"
msgid "Helipad"
msgstr "Lądowisko dla helikopterów"
@@ -22184,10 +22347,10 @@ msgstr "tak"
msgctxt "airmark"
msgid "Beacon"
-msgstr ""
+msgstr "Radiolatarnia"
msgid "Navigationaid"
-msgstr ""
+msgstr "Wspomaganie nawigacji"
msgid "Windsock"
msgstr "Rękaw"
@@ -22296,7 +22459,7 @@ msgid "Takeaway"
msgstr "Na wynos"
msgid "Delivery"
-msgstr ""
+msgstr "Dostawa"
msgid "Mo-Su 12:00-22:00"
msgstr ""
@@ -22580,7 +22743,7 @@ msgid "Artist Name"
msgstr "Imię i nazwisko artysty"
msgid "Studio"
-msgstr ""
+msgstr "Studio"
msgid "audio"
msgstr "dźwiękowe"
@@ -22761,7 +22924,7 @@ msgid "Town Hall"
msgstr "Ratusz"
msgid "Community Centre"
-msgstr "Centrum społeczne"
+msgstr "Centrum społeczności"
msgid "Embassy"
msgstr "Ambasada"
@@ -22845,7 +23008,7 @@ msgid "Point Name"
msgstr "Nazwa punktu"
msgid "Emergency Phone Number"
-msgstr ""
+msgstr "Numer telefonu alarmowego"
msgid "(Use number as shown on plate.)"
msgstr ""
@@ -22863,7 +23026,7 @@ msgid "Automated Defibrillator"
msgstr "Automatyczny defibrylator (AED)"
msgid "Location description"
-msgstr ""
+msgstr "Opis położenia"
msgid "Phone Number"
msgstr "Numer telefonu"
@@ -22903,7 +23066,7 @@ msgstr "ścienny"
msgctxt "pipeline"
msgid "pond"
-msgstr "z jeziora (suchy)"
+msgstr "z jeziora/stawu (suchy)"
msgid "Diameter (in mm)"
msgstr "Średnica (w mm)"
@@ -22952,28 +23115,28 @@ msgid "Siren"
msgstr "Syrena"
msgid "pneumatic"
-msgstr ""
+msgstr "pneumatyczna"
msgid "electronic"
-msgstr ""
+msgstr "elektroniczna"
msgid "mechanical"
-msgstr ""
+msgstr "mechaniczna"
msgid "Purpose"
msgstr "Przeznaczenie"
msgid "tornado"
-msgstr ""
+msgstr "tornado"
msgid "fire"
-msgstr ""
+msgstr "pożar"
msgid "air_raid"
-msgstr ""
+msgstr "nalot"
msgid "civil_defense"
-msgstr ""
+msgstr "obrona cywilna"
msgid "Range (in meters)"
msgstr "Zasięg (w metrach)"
@@ -23820,7 +23983,7 @@ msgstr "ruiny"
msgctxt "building"
msgid "Levels"
-msgstr "Poziomy"
+msgstr "Kondygnacje"
msgid "Residential Building"
msgstr "Budynek mieszkalny"
@@ -23870,7 +24033,7 @@ msgstr "Część budynku"
msgctxt "building"
msgid "Skipped Levels"
-msgstr "Pominięte poziomy"
+msgstr "Pominięte kondygnacje"
msgid "Skipped height (meters)"
msgstr "Wysokość podstawy (metry)"
@@ -23904,7 +24067,7 @@ msgstr "klatka schodowa"
msgctxt "entrance"
msgid "home"
-msgstr ""
+msgstr "mieszkanie"
msgid "Entrance number"
msgstr "Numer wejścia"
@@ -23928,7 +24091,7 @@ msgid "Flagpole"
msgstr "Maszt (dla flagi)"
msgid "Cross"
-msgstr ""
+msgstr "Krzyż"
msgid "Works"
msgstr "Zakład produkcyjny"
@@ -24107,7 +24270,7 @@ msgstr "Latarnia morska"
msgctxt "man_made"
msgid "Beacon"
-msgstr ""
+msgstr "Nabieżnik"
msgid "Street Lamp"
msgstr "Latarnia uliczna"
@@ -25078,16 +25241,16 @@ msgid "stately"
msgstr ""
msgid "defensive"
-msgstr ""
+msgstr "obronny"
msgid "fortress"
-msgstr ""
+msgstr "forteca"
msgid "manor"
-msgstr ""
+msgstr "dwór"
msgid "palace"
-msgstr ""
+msgstr "pałac"
msgid "Archaeological Site"
msgstr "Wykopalisko archeologiczne"
@@ -25105,7 +25268,7 @@ msgid "settlement"
msgstr ""
msgid "necropolis"
-msgstr ""
+msgstr "nekropolia"
msgid "Battlefield"
msgstr "Pole bitwy"
@@ -25463,7 +25626,7 @@ msgid "cigarettes"
msgstr "papierosy"
msgid "coffee"
-msgstr ""
+msgstr "kawa"
msgid "condoms"
msgstr "prezerwatywy"
@@ -25472,7 +25635,7 @@ msgid "drinks"
msgstr "napoje"
msgid "elongated_coin"
-msgstr ""
+msgstr "medaliki"
msgid "excrement_bags"
msgstr "torby na odchody"
@@ -25663,16 +25826,16 @@ msgid "Government"
msgstr "Instytucje rządowe"
msgid "ministry"
-msgstr ""
+msgstr "ministerstwo"
msgid "prosecutor"
-msgstr ""
+msgstr "prokurator"
msgid "tax"
-msgstr ""
+msgstr "podatki"
msgid "register_office"
-msgstr ""
+msgstr "rejestracja"
msgctxt "office"
msgid "Insurance"
@@ -25879,13 +26042,13 @@ msgid "Village"
msgstr "Wieś"
msgid "Hamlet"
-msgstr "Przysiółek"
+msgstr "Przysiółek/osada"
msgid "Isolated Dwelling"
msgstr "Pojedyncze zabudowania"
msgid "Suburb"
-msgstr "Przedmieście"
+msgstr "Dzielnica"
msgid "Neighbourhood"
msgstr "Osiedle/Sąsiedztwo"
@@ -25939,13 +26102,13 @@ msgid "extinct"
msgstr "wygasły"
msgid "stratovolcano"
-msgstr "Stratowulkan"
+msgstr "stratowulkan"
msgid "shield"
-msgstr "Wulkan tarczowy"
+msgstr "wulkan tarczowy"
msgid "scoria"
-msgstr ""
+msgstr "stożek wulkaniczny"
msgid "Ridge"
msgstr "Grzbiet górski"
@@ -25983,13 +26146,13 @@ msgid "Reef"
msgstr "Rafa"
msgid "coral"
-msgstr ""
+msgstr "koralowce"
msgid "oyster"
-msgstr ""
+msgstr "ostrygi"
msgid "rock"
-msgstr ""
+msgstr "skały"
msgid "Nature"
msgstr "Natura"
@@ -26154,7 +26317,7 @@ msgid "Farmland"
msgstr "Grunty rolne"
msgid "Crop"
-msgstr "Plony"
+msgstr "Uprawa"
msgctxt "crop"
msgid "corn"
@@ -26348,7 +26511,7 @@ msgid "Street name"
msgstr "Nazwa ulicy"
msgid "Place name"
-msgstr "Nazwa miejsca"
+msgstr "Nazwa miejsca/miejscowości"
msgid "City name"
msgstr "Nazwa miejscowości"
@@ -26360,23 +26523,23 @@ msgid "Country code"
msgstr "Kod kraju"
msgid "Unit/Suite"
-msgstr "Jednostka"
+msgstr "Jednostka/blok"
msgid "House name"
msgstr "Nazwa domu"
msgid "Subdistrict"
-msgstr "Poddystrykt"
+msgstr "Poddystrykt/gmina"
msgid "District"
-msgstr "Dystrykt"
+msgstr "Dystrykt/powiat"
msgid "Province"
-msgstr "Województwo"
+msgstr "Prowincja/województwo"
msgctxt "addr:"
msgid "State"
-msgstr "Stan"
+msgstr "Stan/kraj"
msgid "AL"
msgstr "AL"
@@ -29188,7 +29351,7 @@ msgstr ""
msgid "Name:"
msgstr "Nazwa:"
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -29215,7 +29378,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -29318,6 +29484,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31043,7 +31215,7 @@ msgid ""
msgstr ""
msgid "Tracktype grades must be given as integers between 0 and 5."
-msgstr ""
+msgstr "Wartości tracktype muszą być liczbą między 0 a 5"
msgid ""
"Surface values must not contain any of the following characters: '','', '' "
@@ -33247,6 +33419,14 @@ msgstr "Nie udało się wydrukować."
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -33295,6 +33475,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -33314,6 +33500,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -33328,7 +33517,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -34535,6 +34737,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -34559,6 +34764,15 @@ msgstr "<html><a href=\"\">Lista zadań</a></html>"
msgid "Select a task ..."
msgstr "Wybierz zadanie..."
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr "Wybierz obszar do pobrania (m²)"
diff --git a/i18n/po/pt.po b/i18n/po/pt.po
index 8f28c61..010b074 100644
--- a/i18n/po/pt.po
+++ b/i18n/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2017-04-07 16:38+0000\n"
"Last-Translator: Rui <xande6ruz at yandex.com>\n"
"Language-Team: Portuguese <pt at 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-07-03 04:56+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:58+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: pt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2650,6 +2650,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "A expressão de pesquisa está incorreta"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Filtrar"
@@ -2754,6 +2757,12 @@ msgstr "todas as linhas fechadas"
msgid "object without useful tags"
msgstr "objeto sem etiquetas úteis"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "metadados"
@@ -2951,6 +2960,9 @@ msgstr "Esperado um integral positivo"
msgid "Range of numbers expected"
msgstr "Esperado um intervalo de números"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Token inesperado. Esperado {0}, encontrado {1}"
@@ -8608,6 +8620,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Número incorreto de argumentos para o favorito"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Ocorreu um erro ao ler a entrada de favoritos: %s"
@@ -8650,6 +8665,9 @@ msgstr "Remover os favoritos selecionados"
msgid "Rename the currently selected bookmark"
msgstr "Alterar o nome do favorito selecionado"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "lat mín"
@@ -14748,6 +14766,9 @@ msgstr "Valor do atributo ''{0}'' ilegal na tag XML ''{1}''. Obteve-se {2}."
msgid "Reading user info ..."
msgstr "A ler a informação de utilizador ..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "A começar a enviar com um pedido por objeto...."
@@ -16627,9 +16648,21 @@ msgstr "Satélite Mapbox"
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -16769,11 +16802,128 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
-msgstr "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
-msgid "IGN Argentina (WMS)"
-msgstr "IGN Argentina (WMS)"
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
+msgstr ""
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI preto e branco 2.5m"
@@ -17189,10 +17339,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -17623,6 +17773,18 @@ msgstr "OSMIE Dail Election Areas"
msgid "OSMIE T.ie Land not in Counties"
msgstr "OSMIE T.ie Land not in Counties"
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr "Lodi - Itália"
@@ -29945,8 +30107,8 @@ msgstr ""
msgid "Name:"
msgstr "Nome:"
-msgid "updated building info"
-msgstr "informações do edifício atualizadas"
+msgid "update building info"
+msgstr ""
msgid "Tag Element"
msgstr "Etiquetar Elemento"
@@ -29972,8 +30134,11 @@ msgstr "Selecionador de Área"
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
-msgstr "Área criada"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
+msgstr ""
msgid "Add address"
msgid_plural "Add addresses"
@@ -30081,6 +30246,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr "Depuração (debug)"
@@ -34244,6 +34415,14 @@ msgstr "A impressão falhou."
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -34290,6 +34469,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -34309,6 +34494,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -34323,7 +34511,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -35596,6 +35797,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -35620,6 +35824,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr "Dfinir área a descarregar (m²)"
diff --git a/i18n/po/pt_BR.po b/i18n/po/pt_BR.po
index 50e4f80..6cdf2bb 100644
--- a/i18n/po/pt_BR.po
+++ b/i18n/po/pt_BR.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
-"PO-Revision-Date: 2017-05-20 04:47+0000\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
+"PO-Revision-Date: 2017-07-28 01:56+0000\n"
"Last-Translator: Nelson A. de Oliveira <naoliv at debian.org>\n"
"Language-Team: Português Brasileiro <gnome-pt_br-list at gnome.org>\n"
"MIME-Version: 1.0\n"
"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-07-03 05:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:06+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: pt_BR\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2616,6 +2616,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Expressão de busca inválida"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Filtro"
@@ -2719,6 +2722,12 @@ msgstr "todos os caminhos fechados"
msgid "object without useful tags"
msgstr "objeto sem tags úteis"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "metadado"
@@ -2911,6 +2920,9 @@ msgstr "É esperado valor Inteiro positivo"
msgid "Range of numbers expected"
msgstr "Intervalo de números esperado"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Token não esperado. Esperava {0}, mas {1} foi encontrado"
@@ -8524,6 +8536,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Número de argumentos para marcador errado"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Erro lendo entrada do marcador: %s"
@@ -8564,6 +8579,9 @@ msgstr "Remover favoritos que estão selecionados"
msgid "Rename the currently selected bookmark"
msgstr "Renomear o favorito selecionado"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "lat mín"
@@ -14568,6 +14586,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Lendo informações do usuário ..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Começando a fazer o upload com um pedido por primitivo..."
@@ -15893,7 +15914,7 @@ msgid "s"
msgstr "s"
msgid "min"
-msgstr "Metodista"
+msgstr "min"
msgid "h"
msgstr "h"
@@ -16422,9 +16443,21 @@ msgstr "Satélite Mapbox"
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -16564,10 +16597,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -16984,10 +17134,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -17416,6 +17566,18 @@ msgstr "OSMIE Dail Election Areas"
msgid "OSMIE T.ie Land not in Counties"
msgstr "OSMIE T.ie Land not in Counties"
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr "Lodi - Itália"
@@ -29685,8 +29847,8 @@ msgstr ""
msgid "Name:"
msgstr "Nome:"
-msgid "updated building info"
-msgstr "informação do edifício atualizadas"
+msgid "update building info"
+msgstr ""
msgid "Tag Element"
msgstr "Elemento da tag"
@@ -29713,8 +29875,11 @@ msgstr "Seletor de área"
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
-msgstr "Criar área"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
+msgstr ""
msgid "Add address"
msgid_plural "Add addresses"
@@ -29827,6 +29992,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr "Debug"
@@ -31083,7 +31254,7 @@ msgid "Import path from GPX layer"
msgstr "Importar caminho da camada GPX"
msgid "Drop existing path"
-msgstr "Largar caminho existente"
+msgstr "Descartar caminho existente"
msgid "No GPX data layer found."
msgstr "Nenhum dado da camada GPX encontrado."
@@ -33981,6 +34152,14 @@ msgstr "Impressão falhou."
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -34027,6 +34206,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -34046,6 +34231,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -34060,7 +34248,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -35316,6 +35517,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -35340,6 +35544,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr "Definir área download (m²)"
diff --git a/i18n/po/rm.po b/i18n/po/rm.po
index 714af88..a5f6d13 100644
--- a/i18n/po/rm.po
+++ b/i18n/po/rm.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2009-06-21 19:14+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Raeto-Romance <rm at 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-07-03 04:56+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:58+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2403,6 +2403,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2499,6 +2502,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2676,6 +2685,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7839,6 +7851,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7875,6 +7890,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13251,6 +13269,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14843,9 +14864,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14985,10 +15018,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15405,10 +15555,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15834,6 +15984,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27747,7 +27909,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27774,7 +27936,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27877,6 +28042,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31766,6 +31937,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31812,6 +31991,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31831,6 +32016,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31845,7 +32033,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33049,6 +33250,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33073,6 +33277,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/ro.po b/i18n/po/ro.po
index 83e07ef..3b01be0 100644
--- a/i18n/po/ro.po
+++ b/i18n/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: JOSM\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2015-02-24 11:34+0000\n"
"Last-Translator: Ciprian <c1pr1an_43v3r at yahoo.com>\n"
"Language-Team: Romanian <gnomero-list at lists.sourceforge.net>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
"== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2017-07-03 04:57+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:58+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"X-Poedit-Country: ROMANIA\n"
"Language: ro\n"
"X-Poedit-Language: Romanian\n"
@@ -2453,6 +2453,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2549,6 +2552,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2726,6 +2735,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7895,6 +7907,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7931,6 +7946,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "min lat"
@@ -13314,6 +13332,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14906,9 +14927,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -15048,10 +15081,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15468,10 +15618,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15897,6 +16047,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27810,7 +27972,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27837,7 +27999,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27940,6 +28105,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31829,6 +32000,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31875,6 +32054,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31894,6 +32079,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31908,7 +32096,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33112,6 +33313,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33136,6 +33340,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/ru.po b/i18n/po/ru.po
index 6e3642f..d2eaca4 100644
--- a/i18n/po/ru.po
+++ b/i18n/po/ru.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
-"PO-Revision-Date: 2017-07-02 05:09+0000\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
+"PO-Revision-Date: 2017-07-27 09:43+0000\n"
"Last-Translator: Aleksey Kabanov <Unknown>\n"
"Language-Team: Koptev Oleg <koptev.oleg at gmail.com>\n"
"MIME-Version: 1.0\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: 2017-07-03 04:57+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:59+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: ru_RU\n"
msgid "Use OAuth"
@@ -2653,6 +2653,9 @@ msgstr "Синтаксис поиска"
msgid "Invalid search expression"
msgstr "Неверное выражение для поиска"
+msgid "Search by preset"
+msgstr "Поиск по заготовке"
+
msgid "Filter"
msgstr "Фильтр"
@@ -2757,6 +2760,12 @@ msgstr "все замкнутые линии"
msgid "object without useful tags"
msgstr "объект без значимых тегов"
+msgid "all objects that use the address preset"
+msgstr "все объекты, использующие заготовку Адрес"
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr "все объекты, использующие заготовки из группы География/Природа"
+
msgid "metadata"
msgstr "метаданные"
@@ -2949,6 +2958,9 @@ msgstr "Ожидалось положительное целое число"
msgid "Range of numbers expected"
msgstr "Ожидалась последовательность чисел"
+msgid "Unknown preset name: "
+msgstr "Неизвестное название заготовки: "
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Неожиданный маркер. Ожидалось {0}, найдено {1}"
@@ -8595,6 +8607,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Неверное количество аргументов для закладки"
+msgid "Home location"
+msgstr "Домашнее местоположение"
+
msgid "Error reading bookmark entry: %s"
msgstr "Ошибка чтения записи в закладке: %s"
@@ -8637,6 +8652,9 @@ msgstr "Удалить выделенные закладки"
msgid "Rename the currently selected bookmark"
msgstr "Переименовать выделенные закладки"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr "Скачать закладки для моих {0} последних пактов правок"
+
msgid "min lat"
msgstr "мин. широта"
@@ -14702,6 +14720,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Чтение информации о пользователе ..."
+msgid "Reading user preferences ..."
+msgstr "Чтение пользовательских настроек..."
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Начало передачи на сервер с отдельным запросом на каждый элемент ..."
@@ -16602,9 +16623,21 @@ msgstr "Спутниковые снимки Mapbox"
msgid "DigitalGlobe Premium Imagery"
msgstr "Снимки DigitalGlobe Premium"
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr "Снимки DigitalGlobe Standard"
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -16751,11 +16784,128 @@ msgstr "Снимки с imagico.de: Земля Эндерби и Берег Ке
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr "Sentinel-2 - снимки Земли Эндерби и Берега Кемпа (true color)"
-msgid "IGN Argentina (TMS)"
-msgstr "IGN Аргентина (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr "IGN - топографическая карта (TMS)"
+
+msgid "IGN topographical map (WMS)"
+msgstr "IGN - топографическая карта (WMS)"
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr "IGN - ортоснимки AMBA a (WMTS)"
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr "IGN - ортоснимки AMBA b (WMTS)"
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr "IGN - ортоснимки AMBA c (WMTS)"
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr "IGN - ортоснимки AMBA d (WMTS)"
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr "IGN - ортоснимки AMBA e (WMTS)"
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr "IGN - ортоснимки AMBA f (WMTS)"
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr "IGN - ортоснимки AMBA 4 (WMTS)"
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr "IGN - ортоснимки AMBA 5 (WMTS)"
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr "IGN - ортоснимки AMBA 6 (WMTS)"
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr "IGN - ортоснимки AMBA 7 (WMTS)"
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr "IGN - ортоснимки Барранкераса (WMTS)"
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr "IGN - ортоснимки Катамарки (WMTS)"
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr "IGN - ортоснимки Кордовы (WMTS)"
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr "IGN - ортоснимки Эль Калафате (WMTS)"
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr "IGN - ортоснимки Эль Родео (WMTS)"
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr "IGN - Ортоснимки Жужуя (WMTS)"
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr "IGN - ортоснимки Ла-Риохи (WMTS)"
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr "IGN - ортоснимки Мендосы (WMTS)"
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr "IGN - ортоснимки Неукена (WMTS)"
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr "IGN - ортоснимки Посадаса (WMTS)"
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr "IGN - ортоснимки Ресистенсии (WMTS)"
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr "IGN - ортоснимки Рио-Гальегоса (WMTS)"
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr "IGN - ортоснимки Рио-Гранде (WMTS)"
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr "IGN - ортоснимки Параны A (WMTS)"
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr "IGN - ортоснимки Параны B (WMTS)"
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr "IGN - ортоснимки Росарио (WMTS)"
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr "IGN - ортоснимки Сальто-Гранде (WMTS)"
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr "IGN - ортоснимки Сан-Хуан (WMTS)"
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr "IGN - ортоснимки Сан-Луиса (WMTS)"
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr "IGN - ортоснимки Санта-Крус III (WMTS)"
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr "IGN - ортоснимки Санта-Крус IV (WMTS)"
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr "IGN - ортоснимки Санта-Крус VI (WMTS)"
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr "IGN - ортоснимки Санта-Фе и Параны (WMTS)"
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr "IGN - ортоснимки Трелью (WMTS)"
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr "IGN - ортоснимки Тукумана (WMTS)"
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr "IGN - ортоснимки Ушуайи (WMTS)"
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
-msgid "IGN Argentina (WMS)"
-msgstr "IGN Аргентина (WMS)"
+msgid "Ministry of Energy and Mining (WMS)"
+msgstr ""
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI черно-белая 2.5м"
@@ -17174,7 +17324,7 @@ msgid "Praha IPR latest orthophoto"
msgstr "Praha IPR: последние ортофото"
msgid "Praha IPR low-vegetation orthophoto"
-msgstr ""
+msgstr "ИРП Праги - ортофото с минимальной растительностью"
msgid "SDFE aerial imagery"
msgstr "Аэрофотоснимки SDFE"
@@ -17185,11 +17335,11 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr "SDFE цифровые топографические карты 1:25 000 (Kort25)"
-msgid "SDFE Terræn Skyggekort (40 cm)"
-msgstr "Дания: отмывка рельефа SDFE (40 см)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
+msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
-msgstr "Дания: отмывка поверхности SDFE 40 см)"
+msgid "SDFE Surface Shadow Map (40 cm)"
+msgstr ""
msgid "SDFE Skærmkort"
msgstr ""
@@ -17637,6 +17787,18 @@ msgstr "OSMIE - избирательные округа Палаты предс
msgid "OSMIE T.ie Land not in Counties"
msgstr "OSMIE: земли вне графств"
+msgid "Israel Hiking"
+msgstr "Израиль - пеший туризм"
+
+msgid "Israel Hiking map"
+msgstr "Карта Израиля для пешего туризма"
+
+msgid "Israel MTB"
+msgstr "Израиль - MTB"
+
+msgid "Israel MTB map"
+msgstr "Карта Израиля для горных велосипедов"
+
msgid "Lodi - Italy"
msgstr "Лоди - Италия"
@@ -17797,6 +17959,8 @@ msgstr "Снимки с imagico.de: Новая Ирландия"
msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
msgstr ""
+"Много отсутствовавших в OSM островов (сейчас в основном обрисованы) "
+"(естественные цвета)"
msgid "imagico.de OSM images for mapping: Coropuna"
msgstr "Снимки с imagico.de: вулкан Коропуна"
@@ -29079,16 +29243,17 @@ msgid "Submit the current changeset to Mapillary"
msgstr "Передать текущий пакет правок в Mapillary"
msgid "rejected"
-msgstr ""
+msgstr "отклонён"
msgid "pending"
msgstr "в ожидании"
msgid "approved"
-msgstr ""
+msgstr "принят"
msgid "{0} images submitted, Changeset key: {1}, State: {2}"
msgstr ""
+"{0} снимков отправлено, идентификатор пакета правок: {1}, состояние: {2}"
msgid "Changeset upload failed with {0} error ''{1} {2}''!"
msgstr ""
@@ -30175,8 +30340,8 @@ msgstr "Источник:"
msgid "Name:"
msgstr "Название:"
-msgid "updated building info"
-msgstr "обновлена информация о здании"
+msgid "update building info"
+msgstr "обновить информацию о здании"
msgid "Tag Element"
msgstr "Задать теги элемента"
@@ -30204,8 +30369,11 @@ msgstr "Автовыделение областей"
msgid "Trying to detect an area at:"
msgstr "Попытка распознать область в точке:"
-msgid "Created area"
-msgstr "Создана область"
+msgid "create building"
+msgstr "создать здание"
+
+msgid "replace building"
+msgstr "заменить здание"
msgid "Add address"
msgid_plural "Add addresses"
@@ -30325,6 +30493,12 @@ msgstr ""
"Пытаться автоматически найти корректный адрес с помощью модуля Austria "
"Address Helper"
+msgid "Replace existing buildings"
+msgstr "Заменять существующие здания"
+
+msgid "Replace an existing building with the new one."
+msgstr "Заменять существующее здание новым."
+
msgid "Debug"
msgstr "Отладка"
@@ -31192,16 +31366,16 @@ msgid "Select the primitives currently selected in the list"
msgstr "Выделить примитивы, которые выбраны в списке"
msgid "Generating matches"
-msgstr ""
+msgstr "Формирование сочетаний"
msgid "Finding matches"
-msgstr ""
+msgstr "Поиск сочетаний"
msgid "Sorting scores"
msgstr "Сортировка баллов"
msgid "Discarding inferior matches"
-msgstr ""
+msgstr "Отсев неподходящих сочетаний"
msgid "Subject"
msgstr "Целевой слой"
@@ -31267,13 +31441,13 @@ msgid "Centroid Distance"
msgstr "Центроидное расстояние"
msgid "Hausdorff Distance (Centroids Aligned)"
-msgstr ""
+msgstr "Метрика Хаусдорфа (выровненные центроиды)"
msgid "Symmetric Difference"
-msgstr ""
+msgstr "Симметрическая разность"
msgid "Symmetric Difference (Centroids Aligned)"
-msgstr ""
+msgstr "Симметрическая разность (выровненные центроиды)"
msgid "Compactness"
msgstr "Компактность"
@@ -34496,11 +34670,20 @@ msgstr "Сбой печати."
msgid "Repeat last fix"
msgstr "Повторить последнее исправление"
-msgid "Do you want to make the roundabout round?"
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
msgstr ""
+"У отношения есть неполные участники. Скачать их и продолжить сортировку?"
+
+msgid "Incomplete Members"
+msgstr "Неполные участники"
+
+msgid "Do you want to make the roundabout round?"
+msgstr "Сделать круговой перекрёсток круглым?"
msgid "Roundabout round"
-msgstr ""
+msgstr "Круглый круговой перекрёсток"
msgid "Do you want to download referrers of platforms and stop positions?"
msgstr "Вы хотите скачать связанные платформы и позиции остановки?"
@@ -34548,6 +34731,12 @@ msgstr "Что вы выберете для продолжения?"
msgid "PT_Assistant Proceed Request"
msgstr "Запрос следующего действия PT_Assistant"
+msgid "Bicycle and foot routes Tests"
+msgstr "Проверка велосипедных и пеших маршрутов"
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr "ОТ: Stop_position не принадлежит линии маршрута"
@@ -34570,6 +34759,9 @@ msgstr ""
"Проверяет совместимость отношений маршрутов со 2-й версией маршрутов "
"общественного транспорта"
+msgid "PT: Relation member roles do not match tags"
+msgstr "ОТ: Роли участника отношения не соответствуют тегам"
+
msgid "Fix error"
msgstr "Исправить ошибку"
@@ -34583,9 +34775,28 @@ msgid ""
"PT: Route gaps can decrease by sorting members. Further validations will be "
"required"
msgstr ""
+"ОТ: Количество разрывов маршрута можно сократить сортировкой участников. "
+"Затем потребуется выполнить проверки"
-msgid "PT: Relation member roles do not match tags"
-msgstr "ОТ: Роли участника отношения не соответствуют тегам"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+"ОТ: Название первой остановки не совпадает с тегом \"from\" в отношении "
+"маршрута"
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+"ОТ: Название последней остановки не совпадает с тегом \"to\" в отношении "
+"маршрута"
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
+msgstr ""
msgid "PT: Route should start and end with a stop_position"
msgstr "ОТ: Маршрут должен начинаться и заканчиваться stop_position"
@@ -35843,6 +36054,9 @@ msgstr "Включить модуль Tofix"
msgid "Auto delete layer"
msgstr "Автоматическое удаление слоя"
+msgid "Set default url"
+msgstr "Задать URL по умолчанию"
+
msgid "Select the checkbox to:"
msgstr "Отметьте необходимые опции:"
@@ -35867,6 +36081,15 @@ msgstr "<html><a href=\"\">Список заданий</a></html>"
msgid "Select a task ..."
msgstr "Выберите задание..."
+msgid "Setting default URL"
+msgstr "Задан URL по умолчанию"
+
+msgid "Enter the new URL"
+msgstr "Введите новый URL"
+
+msgid "Setting new URL: "
+msgstr "Выбран новый URL: "
+
msgid "Set download area (m²)"
msgstr "Задайте область скачивания (м²)"
@@ -37904,3 +38127,18 @@ msgstr "Приступить к вождению"
msgid "Drive a race car on this layer"
msgstr "Вести гоночный автомобиль на этом слое"
+
+#~ msgid "SDFE Terræn Skyggekort (40 cm)"
+#~ msgstr "Дания: отмывка рельефа SDFE (40 см)"
+
+#~ msgid "SDFE Overflade Skyggekort (40 cm)"
+#~ msgstr "Дания: отмывка поверхности SDFE 40 см)"
+
+#~ msgid "Ministerio de Energía y Minería (WMS)"
+#~ msgstr "Министерство энергетики и горнодобывающей промышленности (WMS)"
+
+#~ msgid "Ministerio de Agroindustria (WMS)"
+#~ msgstr "Министерство сельского хозяйства (WMS)"
+
+#~ msgid "PT: There is a gap in the bicycle / foot / horse route"
+#~ msgstr "ОТ: Разрыв в велосипедном / пешем / конном маршруте"
diff --git a/i18n/po/sk.po b/i18n/po/sk.po
index ae978e2..89c3231 100644
--- a/i18n/po/sk.po
+++ b/i18n/po/sk.po
@@ -9,16 +9,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
-"PO-Revision-Date: 2017-06-30 21:37+0000\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
+"PO-Revision-Date: 2017-07-22 11:42+0000\n"
"Last-Translator: aceman444 <Unknown>\n"
"Language-Team: Slovak <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2017-07-03 04:59+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:00+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: sk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2617,6 +2617,9 @@ msgstr "Formát vyhľadávacieho výrazu"
msgid "Invalid search expression"
msgstr "Chybný vyhľadávaný výraz"
+msgid "Search by preset"
+msgstr "Hľadať podľa predvoľby"
+
msgid "Filter"
msgstr "Filter"
@@ -2719,6 +2722,12 @@ msgstr "všetky uzavreté cesty"
msgid "object without useful tags"
msgstr "objekt bez užitočných značiek"
+msgid "all objects that use the address preset"
+msgstr "všetky objekty používajúce predvoľby adresy"
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr "všetky objekty používajúce predvoľbu v skupine Geografia/Príroda"
+
msgid "metadata"
msgstr "metadáta"
@@ -2910,6 +2919,9 @@ msgstr "Očakáva sa kladné celé číslo"
msgid "Range of numbers expected"
msgstr "Očakávaný rozsah čísel"
+msgid "Unknown preset name: "
+msgstr "Neznámy názov predvoľby: "
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Neočakávaný symbol. Očakávaný {0}, nájdený {1}"
@@ -8538,6 +8550,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Nesprávny počet argumentov pre záložky"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Chyba pri čítaní položky záložky:%s"
@@ -8578,6 +8593,9 @@ msgstr "Vymazať vybraté záložky"
msgid "Rename the currently selected bookmark"
msgstr "Premenovať vybratú záložku"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "min. šírka"
@@ -14625,6 +14643,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Čítam používateľské info ..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
"Zahajujem nahrávanie s jednou žiadosťou pre každý základný objekt ..."
@@ -16518,9 +16539,21 @@ msgstr "MapBox Satelit"
msgid "DigitalGlobe Premium Imagery"
msgstr "DigitalGlobe Prémiové snímky"
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr "DigitalGlobe Štandardné snímky"
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -16661,11 +16694,128 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
-msgstr "IGN Argentína (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
-msgid "IGN Argentina (WMS)"
-msgstr "IGN Argentína (WMS)"
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
+msgstr ""
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI čiernobiela 2.5m"
@@ -17081,11 +17231,11 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
-msgstr "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
+msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
-msgstr "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
+msgstr ""
msgid "SDFE Skærmkort"
msgstr ""
@@ -17516,6 +17666,18 @@ msgstr "OSMIE Dail Election Areas"
msgid "OSMIE T.ie Land not in Counties"
msgstr "OSMIE T.ie Pozemky mimo okresov"
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr "Lodi - Taliansko"
@@ -29708,7 +29870,7 @@ msgstr ""
msgid "Name:"
msgstr "Názov:"
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -29735,7 +29897,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -29840,6 +30005,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -33827,6 +33998,14 @@ msgstr "Tlač zlyhala."
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -33876,6 +34055,12 @@ msgstr "Ako chcete pokračovať?"
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr "PT: Miesto zastavenia vozidla nie je súčasťou cesty"
@@ -33896,6 +34081,9 @@ msgid ""
msgstr ""
"Overí, či sú relácie trás kompatibilné so schémou hromadnej dopravy verzie 2"
+msgid "PT: Relation member roles do not match tags"
+msgstr "PT: Role členov relácie nesúhlasia so značkami"
+
msgid "Fix error"
msgstr ""
@@ -33911,8 +34099,21 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
-msgstr "PT: Role členov relácie nesúhlasia so značkami"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
+msgstr ""
msgid "PT: Route should start and end with a stop_position"
msgstr "PT: Trasa by mala začínať a končiť so \"stop_position\""
@@ -35132,6 +35333,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -35156,6 +35360,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
@@ -37108,3 +37321,9 @@ msgstr "Ísť jazdiť"
msgid "Drive a race car on this layer"
msgstr "Jazdiť so závodným autom na tejto vrstve"
+
+#~ msgid "SDFE Terræn Skyggekort (40 cm)"
+#~ msgstr "SDFE Terræn Skyggekort (40 cm)"
+
+#~ msgid "SDFE Overflade Skyggekort (40 cm)"
+#~ msgstr "SDFE Overflade Skyggekort (40 cm)"
diff --git a/i18n/po/sl.po b/i18n/po/sl.po
index 8c0981c..719208c 100644
--- a/i18n/po/sl.po
+++ b/i18n/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2015-11-07 17:38+0000\n"
"Last-Translator: Joško Horvat <Unknown>\n"
"Language-Team: Slovenian <sl at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
"n%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2017-07-03 04:59+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:01+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: sl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2417,6 +2417,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2513,6 +2516,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2690,6 +2699,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7873,6 +7885,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7909,6 +7924,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13311,6 +13329,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14907,9 +14928,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -15049,10 +15082,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15469,10 +15619,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15898,6 +16048,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27811,7 +27973,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27838,7 +28000,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27941,6 +28106,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31832,6 +32003,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31878,6 +32057,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31897,6 +32082,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31911,7 +32099,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33115,6 +33316,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33139,6 +33343,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/sq.po b/i18n/po/sq.po
index 98fdd77..333a73f 100644
--- a/i18n/po/sq.po
+++ b/i18n/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2011-11-04 19:43+0000\n"
"Last-Translator: StefanPrifti <Unknown>\n"
"Language-Team: FLOSS Kosova\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-07-03 04:33+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:33+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2403,6 +2403,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2499,6 +2502,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2676,6 +2685,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7839,6 +7851,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7875,6 +7890,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13251,6 +13269,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14843,9 +14864,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14985,10 +15018,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15405,10 +15555,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15834,6 +15984,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27747,7 +27909,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27774,7 +27936,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27877,6 +28042,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31766,6 +31937,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31812,6 +31991,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31831,6 +32016,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31845,7 +32033,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33049,6 +33250,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33073,6 +33277,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/sr.po b/i18n/po/sr.po
index 4e4509b..2bf68c4 100644
--- a/i18n/po/sr.po
+++ b/i18n/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2015-02-01 15:30+0000\n"
"Last-Translator: Slobodan Simić <Unknown>\n"
"Language-Team: Serbian <sr at 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: 2017-07-03 04:58+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 04:59+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: sr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2404,6 +2404,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2500,6 +2503,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2677,6 +2686,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7840,6 +7852,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7876,6 +7891,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13253,6 +13271,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14845,9 +14866,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14987,10 +15020,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15407,10 +15557,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15836,6 +15986,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27749,7 +27911,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27776,7 +27938,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27879,6 +28044,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31768,6 +31939,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31814,6 +31993,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31833,6 +32018,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31847,7 +32035,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33051,6 +33252,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33075,6 +33279,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/sv.po b/i18n/po/sv.po
index 7d143d6..96203d6 100644
--- a/i18n/po/sv.po
+++ b/i18n/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2017-02-22 12:40+0000\n"
"Last-Translator: Erik <Unknown>\n"
"Language-Team: Swedish <sv at 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-07-03 05:00+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:02+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: sv\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2584,6 +2584,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "Ogiltigt sökuttryck"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Filter"
@@ -2687,6 +2690,12 @@ msgstr "alla slutna sträckor"
msgid "object without useful tags"
msgstr "objekt utan användbara taggar"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "metadata"
@@ -2879,6 +2888,9 @@ msgstr "Positivt heltal förväntas"
msgid "Range of numbers expected"
msgstr "Ett sifferintervall förväntades"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Oväntad symbol. Förväntade {0}, men fann {1}"
@@ -8202,6 +8214,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Fel antal argument för bokmärke"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Fel inträffade under läsning av bokmärket: %s"
@@ -8242,6 +8257,9 @@ msgstr "Radera valda bokmärken"
msgid "Rename the currently selected bookmark"
msgstr "Byt namn på valt bokmärke"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "min lat"
@@ -13776,6 +13794,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Läser användarinfo ..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -15465,9 +15486,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -15607,10 +15640,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -16027,10 +16177,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -16456,6 +16606,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -28408,7 +28570,7 @@ msgstr ""
msgid "Name:"
msgstr "Namn:"
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -28435,7 +28597,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -28538,6 +28703,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -32467,6 +32638,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -32513,6 +32692,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -32532,6 +32717,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -32546,7 +32734,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33753,6 +33954,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33777,6 +33981,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/ta.po b/i18n/po/ta.po
index 5c608f3..fa1acd9 100644
--- a/i18n/po/ta.po
+++ b/i18n/po/ta.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2017-06-06 01:06+0000\n"
"Last-Translator: Stephane <Unknown>\n"
"Language-Team: Tamil <ta at 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-07-03 05:00+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:02+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"X-Poedit-Country: INDIA\n"
"Language: ta\n"
"X-Poedit-Language: Tamil\n"
@@ -2439,6 +2439,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2535,6 +2538,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2712,6 +2721,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7876,6 +7888,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7912,6 +7927,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13290,6 +13308,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14882,9 +14903,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -15024,10 +15057,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15444,10 +15594,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15873,6 +16023,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27786,7 +27948,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27813,7 +27975,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27916,6 +28081,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31811,6 +31982,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31857,6 +32036,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31876,6 +32061,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31890,7 +32078,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33094,6 +33295,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33118,6 +33322,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/te.po b/i18n/po/te.po
index 5199720..4b44fd9 100644
--- a/i18n/po/te.po
+++ b/i18n/po/te.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2011-05-13 08:50+0000\n"
"Last-Translator: Praveen Illa <mail2ipn at gmail.com>\n"
"Language-Team: Telugu <te at 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-07-03 05:01+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:03+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: te\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2403,6 +2403,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2499,6 +2502,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2676,6 +2685,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7839,6 +7851,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7875,6 +7890,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13251,6 +13269,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14843,9 +14864,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14985,10 +15018,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15405,10 +15555,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15834,6 +15984,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27747,7 +27909,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27774,7 +27936,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27877,6 +28042,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31766,6 +31937,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31812,6 +31991,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31831,6 +32016,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31845,7 +32033,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33049,6 +33250,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33073,6 +33277,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/th.po b/i18n/po/th.po
index f9a2af2..40c3409 100644
--- a/i18n/po/th.po
+++ b/i18n/po/th.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2009-03-23 02:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Thai <th at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-03 05:01+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:03+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: th\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2403,6 +2403,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2499,6 +2502,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2676,6 +2685,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7839,6 +7851,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7875,6 +7890,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13251,6 +13269,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14843,9 +14864,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14985,10 +15018,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15405,10 +15555,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15834,6 +15984,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27747,7 +27909,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27774,7 +27936,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27877,6 +28042,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31766,6 +31937,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31812,6 +31991,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31831,6 +32016,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31845,7 +32033,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33049,6 +33250,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33073,6 +33277,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/tr.po b/i18n/po/tr.po
index 295b91b..988dc1e 100644
--- a/i18n/po/tr.po
+++ b/i18n/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2017-02-06 01:25+0000\n"
"Last-Translator: Ferhad Fidan <ferhad at f-blog.info>\n"
"Language-Team: Türkçe <>\n"
@@ -17,8 +17,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-07-03 05:02+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:04+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2452,6 +2452,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Süzgeç"
@@ -2548,6 +2551,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2728,6 +2737,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7903,6 +7915,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7941,6 +7956,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "min lat"
@@ -13349,6 +13367,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14948,9 +14969,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -15090,10 +15123,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15510,10 +15660,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15939,6 +16089,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27852,7 +28014,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27879,7 +28041,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27982,6 +28147,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31885,6 +32056,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31931,6 +32110,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31950,6 +32135,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31964,7 +32152,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33168,6 +33369,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33192,6 +33396,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/ug.po b/i18n/po/ug.po
index d9d7d88..806cca7 100644
--- a/i18n/po/ug.po
+++ b/i18n/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2012-07-14 16:22+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Uyghur <ug at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-03 05:02+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:04+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2403,6 +2403,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2499,6 +2502,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2676,6 +2685,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7839,6 +7851,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7875,6 +7890,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13251,6 +13269,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14843,9 +14864,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14985,10 +15018,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15405,10 +15555,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15834,6 +15984,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27747,7 +27909,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27774,7 +27936,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27877,6 +28042,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31766,6 +31937,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31812,6 +31991,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31831,6 +32016,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31845,7 +32033,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33049,6 +33250,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33073,6 +33277,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/uk.po b/i18n/po/uk.po
index 1700afe..a3884ec 100644
--- a/i18n/po/uk.po
+++ b/i18n/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2017-06-25 14:54+0000\n"
"Last-Translator: andygol <Unknown>\n"
"Language-Team: Ukrainian <uk at 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: 2017-07-03 05:03+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:04+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: uk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2648,6 +2648,9 @@ msgstr "Синтаксис пошуку"
msgid "Invalid search expression"
msgstr "Помилковий вираз для пошуку"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Фільтр"
@@ -2750,6 +2753,12 @@ msgstr "всі замкнені лінії"
msgid "object without useful tags"
msgstr "об’єкт без корисних теґів"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "метадані"
@@ -2941,6 +2950,9 @@ msgstr "Очікується позитивне ціле число"
msgid "Range of numbers expected"
msgstr "Очікується діапазон чисел"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Непередбачений елемент. Очікувалось {0}, знайдено {1}"
@@ -8576,6 +8588,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Помилкова кількість аргументів для закладки"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Помилка читання закладки: %s"
@@ -8616,6 +8631,9 @@ msgstr "Вилучити вибрані закладки"
msgid "Rename the currently selected bookmark"
msgstr "Перейменувати вибрану закладку"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "мін. шир."
@@ -14656,6 +14674,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Читання інформації про учасника…"
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
"Початок надсилання даних на сервер окремими запитами по кожному елементу…"
@@ -16561,9 +16582,21 @@ msgstr "Супутникові знімки Mapbox"
msgid "DigitalGlobe Premium Imagery"
msgstr "Знімки DigitalGlobe Premium"
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr "Знімки DigitalGlobe Standard"
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -16707,11 +16740,128 @@ msgstr "imagico.de - знімки OSM для мапінгу: Земля Ендб
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr "Sentinel-2 - знімки Землі Ендербі та Берега Кемпа (true color)"
-msgid "IGN Argentina (TMS)"
-msgstr "IGN Аргентина (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
-msgid "IGN Argentina (WMS)"
-msgstr "IGN Аргентина (WMS)"
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
+msgstr ""
msgid "AGRI black-and-white 2.5m"
msgstr "AGRI чорно-біла 2,5 м"
@@ -17140,11 +17290,11 @@ msgstr "SDFE Кадастровий поділ - вид INSPIRE"
msgid "SDFE DTK Kort25"
msgstr "SDFE DTK Kort25"
-msgid "SDFE Terræn Skyggekort (40 cm)"
-msgstr "SDFE мапа рельєфу (40 см)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
+msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
-msgstr "SDFE мапа поверхні (40 см)"
+msgid "SDFE Surface Shadow Map (40 cm)"
+msgstr ""
msgid "SDFE Skærmkort"
msgstr "SDFE Skærmkort"
@@ -17594,6 +17744,18 @@ msgstr "OSMIE - виборчі округи Палати представник
msgid "OSMIE T.ie Land not in Counties"
msgstr "OSMIE T.ie Землі по за графствами"
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr "Лоді - Італія"
@@ -30096,8 +30258,8 @@ msgstr "Джерело:"
msgid "Name:"
msgstr "Назва:"
-msgid "updated building info"
-msgstr "оновлена інформація про будівлі"
+msgid "update building info"
+msgstr ""
msgid "Tag Element"
msgstr "Задати теґи"
@@ -30123,8 +30285,11 @@ msgstr "Виділення ділянки"
msgid "Trying to detect an area at:"
msgstr "Намагаюсь знайти полігони у:"
-msgid "Created area"
-msgstr "Створена ділянка"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
+msgstr ""
msgid "Add address"
msgid_plural "Add addresses"
@@ -30242,6 +30407,12 @@ msgstr ""
"Автоматично намагатись відшукати правильну адресу за допомогою втулка "
"Austria Address Helper"
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr "Відлагодження"
@@ -34409,6 +34580,14 @@ msgstr "Збій друку."
msgid "Repeat last fix"
msgstr "Повторити останні виправлення"
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr "Ви бажаєте зробити проїзд по кругу?"
@@ -34461,6 +34640,12 @@ msgstr "Як бажаєте продовжити?"
msgid "PT_Assistant Proceed Request"
msgstr "ГТ_Помічник Продовжити запит"
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr "ГТ: місце зупинки не входить до складу дороги"
@@ -34482,6 +34667,9 @@ msgstr ""
"Перевірити чи звʼязок сумісний зі схемою позначення громадського транспорту "
"версії 2"
+msgid "PT: Relation member roles do not match tags"
+msgstr "ГТ: Роль члена звʼязку не відповідає теґам"
+
msgid "Fix error"
msgstr "Виправити помилку"
@@ -34498,8 +34686,21 @@ msgstr ""
"ГТ: Кількість розривів в маршруті може бути зменшена після виконання "
"сорутваня його елементів. Після цього потрібна додаткова перевірка."
-msgid "PT: Relation member roles do not match tags"
-msgstr "ГТ: Роль члена звʼязку не відповідає теґам"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
+msgstr ""
msgid "PT: Route should start and end with a stop_position"
msgstr "ГТ: Маршрут повинен починатись та закінчуватись stop_position"
@@ -35758,6 +35959,9 @@ msgstr "Ввімкнути втулок ToFix"
msgid "Auto delete layer"
msgstr "Автоматичне вилучення шарів"
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr "Поставте позначку для:"
@@ -35782,6 +35986,15 @@ msgstr "<html><a href=\"\">Перелік завдань</a></html>"
msgid "Select a task ..."
msgstr "Оберіть завдання…"
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr "Ділянка для завантаження (м²)"
@@ -37810,3 +38023,9 @@ msgstr "Кермувати"
msgid "Drive a race car on this layer"
msgstr "Керуйте гоночним автомобілем на цьому шарі"
+
+#~ msgid "SDFE Terræn Skyggekort (40 cm)"
+#~ msgstr "SDFE мапа рельєфу (40 см)"
+
+#~ msgid "SDFE Overflade Skyggekort (40 cm)"
+#~ msgstr "SDFE мапа поверхні (40 см)"
diff --git a/i18n/po/ur.po b/i18n/po/ur.po
index 3d2bc6f..e3975eb 100644
--- a/i18n/po/ur.po
+++ b/i18n/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2010-05-13 04:15+0000\n"
"Last-Translator: Shoaib Mirza <Unknown>\n"
"Language-Team: Urdu <ur at 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-07-03 05:03+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:05+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: ur\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2403,6 +2403,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2499,6 +2502,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2676,6 +2685,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7839,6 +7851,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7875,6 +7890,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13251,6 +13269,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14843,9 +14864,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14985,10 +15018,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15405,10 +15555,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15834,6 +15984,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27747,7 +27909,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27774,7 +27936,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27877,6 +28042,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31766,6 +31937,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31812,6 +31991,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31831,6 +32016,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31845,7 +32033,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33049,6 +33250,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33073,6 +33277,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/vi.po b/i18n/po/vi.po
index ef9395e..6378cdd 100644
--- a/i18n/po/vi.po
+++ b/i18n/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2015-05-14 20:17+0000\n"
"Last-Translator: Mạnh <laituanmanh32 at gmail.com>\n"
"Language-Team: Vietnamese <vi at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-03 05:03+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:05+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: vi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2564,6 +2564,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "biểu thức tìm kiếm không hợp lệ"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "Filter"
@@ -2666,6 +2669,12 @@ msgstr "tất cả các cách kín"
msgid "object without useful tags"
msgstr "đối tượng mà không có thẻ hữu ích"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "siêu dữ liệu"
@@ -2858,6 +2867,9 @@ msgstr "số nguyên dương dự kiến"
msgid "Range of numbers expected"
msgstr "Phạm vi của các con số dự kiến"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "token Unexpected. Dự kiến {0}, tìm thấy {1}"
@@ -8299,6 +8311,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "Sai số lập luận cho bookmark"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "Lỗi đọc entry bookmark:% s"
@@ -8338,6 +8353,9 @@ msgstr "Hủy bỏ các dấu trang hiện tại được chọn"
msgid "Rename the currently selected bookmark"
msgstr "Đổi tên bookmark hiện đang được chọn"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "min lat"
@@ -14197,6 +14215,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr "Đọc thông tin người sử dụng ..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "Bắt đầu tải lên với một yêu cầu mỗi nguyên thủy ..."
@@ -15971,9 +15992,21 @@ msgstr "Mapbox vệ tinh"
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -16113,10 +16146,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -16533,10 +16683,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -16964,6 +17114,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
@@ -29185,8 +29347,8 @@ msgstr ""
msgid "Name:"
msgstr "Name:"
-msgid "updated building info"
-msgstr "cập nhật thông tin xây dựng"
+msgid "update building info"
+msgstr ""
msgid "Tag Element"
msgstr "Tag Element"
@@ -29212,8 +29374,11 @@ msgstr "Selector"
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
-msgstr "khu vực tạo"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
+msgstr ""
msgid "Add address"
msgid_plural "Add addresses"
@@ -29319,6 +29484,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -33415,6 +33586,14 @@ msgstr "In ấn đã thất bại."
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -33461,6 +33640,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -33480,6 +33665,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -33494,7 +33682,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -34742,6 +34943,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -34766,6 +34970,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/wae.po b/i18n/po/wae.po
index a65e3c5..b9e6245 100644
--- a/i18n/po/wae.po
+++ b/i18n/po/wae.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2016-03-09 22:17+0000\n"
"Last-Translator: Simon Legner <Unknown>\n"
"Language-Team: Walser <wae at 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-07-03 05:07+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:10+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -2402,6 +2402,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr ""
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr ""
@@ -2498,6 +2501,12 @@ msgstr ""
msgid "object without useful tags"
msgstr ""
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr ""
@@ -2675,6 +2684,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr ""
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr ""
@@ -7838,6 +7850,9 @@ msgstr ""
msgid "Wrong number of arguments for bookmark"
msgstr ""
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr ""
@@ -7874,6 +7889,9 @@ msgstr ""
msgid "Rename the currently selected bookmark"
msgstr ""
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr ""
@@ -13250,6 +13268,9 @@ msgstr ""
msgid "Reading user info ..."
msgstr ""
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -14842,9 +14863,21 @@ msgstr ""
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr ""
@@ -14984,10 +15017,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15404,10 +15554,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15833,6 +15983,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27746,7 +27908,7 @@ msgstr ""
msgid "Name:"
msgstr ""
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27773,7 +27935,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -27876,6 +28041,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr ""
@@ -31765,6 +31936,14 @@ msgstr ""
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31811,6 +31990,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -31830,6 +32015,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -31844,7 +32032,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33048,6 +33249,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33072,6 +33276,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/zh_CN.po b/i18n/po/zh_CN.po
index 16636c7..1bf8550 100644
--- a/i18n/po/zh_CN.po
+++ b/i18n/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
"PO-Revision-Date: 2016-10-23 14:49+0000\n"
"Last-Translator: mmyfl <Unknown>\n"
"Language-Team: 汉语 <>\n"
@@ -18,8 +18,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-03 05:06+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:08+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: zh_CN\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2402,6 +2402,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "无效的搜索表达式"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "过滤器"
@@ -2503,6 +2506,12 @@ msgstr "所有封闭的路径"
msgid "object without useful tags"
msgstr "物件没有有用的标签"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "元数据"
@@ -2685,6 +2694,9 @@ msgstr "需要正整数"
msgid "Range of numbers expected"
msgstr "预计的数字范围"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "意外的令牌。预期 {0}，发现 {1}"
@@ -7843,6 +7855,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "错误的书签参数值"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "读取书签时发生错误：%s"
@@ -7879,6 +7894,9 @@ msgstr "删除目前选定的书签"
msgid "Rename the currently selected bookmark"
msgstr "重新命名目前选定的书签"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "最小纬度"
@@ -13333,6 +13351,9 @@ msgstr "XML 标签“{1}”的属性“{0}”有不合法的数值。得到 {2}
msgid "Reading user info ..."
msgstr "正在读取用户信息..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "正在开始以每个原型一次要求的方式上传..."
@@ -14945,9 +14966,21 @@ msgstr "Mapbox 卫星"
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -15087,10 +15120,127 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
msgstr ""
msgid "AGRI black-and-white 2.5m"
@@ -15507,10 +15657,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15936,6 +16086,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -27929,7 +28091,7 @@ msgstr ""
msgid "Name:"
msgstr "名称："
-msgid "updated building info"
+msgid "update building info"
msgstr ""
msgid "Tag Element"
@@ -27956,7 +28118,10 @@ msgstr ""
msgid "Trying to detect an area at:"
msgstr ""
-msgid "Created area"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
msgstr ""
msgid "Add address"
@@ -28059,6 +28224,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr "调试"
@@ -31989,6 +32160,14 @@ msgstr "打印已失败。"
msgid "Repeat last fix"
msgstr ""
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -32035,6 +32214,12 @@ msgstr ""
msgid "PT_Assistant Proceed Request"
msgstr ""
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr ""
@@ -32054,6 +32239,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+msgid "PT: Relation member roles do not match tags"
+msgstr ""
+
msgid "Fix error"
msgstr ""
@@ -32068,7 +32256,20 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
msgstr ""
msgid "PT: Route should start and end with a stop_position"
@@ -33276,6 +33477,9 @@ msgstr ""
msgid "Auto delete layer"
msgstr ""
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33300,6 +33504,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr ""
diff --git a/i18n/po/zh_TW.po b/i18n/po/zh_TW.po
index 74bc274..575c060 100644
--- a/i18n/po/zh_TW.po
+++ b/i18n/po/zh_TW.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 01:33+0200\n"
-"PO-Revision-Date: 2017-04-30 22:15+0000\n"
-"Last-Translator: Wayne Su <Unknown>\n"
+"POT-Creation-Date: 2017-07-30 03:40+0200\n"
+"PO-Revision-Date: 2017-07-12 09:31+0000\n"
+"Last-Translator: Supaplex <Unknown>\n"
"Language-Team: Traditional Chinese\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-07-03 05:05+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-07-30 05:07+0000\n"
+"X-Generator: Launchpad (build 18441)\n"
"Language: zh_TW\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2398,6 +2398,9 @@ msgstr ""
msgid "Invalid search expression"
msgstr "無效的搜尋表示式"
+msgid "Search by preset"
+msgstr ""
+
msgid "Filter"
msgstr "過濾條件"
@@ -2497,6 +2500,12 @@ msgstr "所有封閉的路徑"
msgid "object without useful tags"
msgstr "物件缺少有用的標籤"
+msgid "all objects that use the address preset"
+msgstr ""
+
+msgid "all objects that use any preset under the Geography/Nature group"
+msgstr ""
+
msgid "metadata"
msgstr "中繼資料"
@@ -2679,6 +2688,9 @@ msgstr ""
msgid "Range of numbers expected"
msgstr "預期的數字範圍"
+msgid "Unknown preset name: "
+msgstr ""
+
msgid "Unexpected token. Expected {0}, found {1}"
msgstr "未預期的記號。應該為 {0}，卻發現 {1}"
@@ -7810,6 +7822,9 @@ msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "書籤的引數數量錯誤"
+msgid "Home location"
+msgstr ""
+
msgid "Error reading bookmark entry: %s"
msgstr "讀取書籤項目時發生錯誤：%s"
@@ -7846,6 +7861,9 @@ msgstr "移除目前選取的書籤"
msgid "Rename the currently selected bookmark"
msgstr "重新命名目前選取的書籤"
+msgid "Download bookmarks for my {0} last changesets"
+msgstr ""
+
msgid "min lat"
msgstr "最小緯度"
@@ -13284,6 +13302,9 @@ msgstr "XML 標籤「{1}」的屬性「{0}」有不合規定的數值。得到 {
msgid "Reading user info ..."
msgstr "正在讀取使用者資訊 ..."
+msgid "Reading user preferences ..."
+msgstr ""
+
msgid "Starting to upload with one request per primitive ..."
msgstr "開妒以每個原型一次要求的方式上傳 ..."
@@ -14886,9 +14907,21 @@ msgstr "Mapbox 衛星圖"
msgid "DigitalGlobe Premium Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
+msgstr ""
+
msgid "DigitalGlobe Standard Imagery"
msgstr ""
+msgid ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
+msgstr ""
+
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -15028,11 +15061,128 @@ msgstr ""
msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
msgstr ""
-msgid "IGN Argentina (TMS)"
-msgstr "阿根廷 IGN (TMS)"
+msgid "IGN topographical map (TMS)"
+msgstr ""
+
+msgid "IGN topographical map (WMS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA a (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA b (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA c (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA d (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA e (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA f (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 4 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 5 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 6 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto AMBA 7 (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Barranqueras (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Catamarca (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Córdoba (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Calafate (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto El Rodeo (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Jujuy (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto La Rioja (WMTS)"
+msgstr ""
-msgid "IGN Argentina (WMS)"
-msgstr "阿根廷 IGN (WMS)"
+msgid "IGN orthophoto Mendoza (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Neuquén (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Posadas (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Resistencia (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Gallegos (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná A (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Río Paraná B (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Rosario (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Salto Grande (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Juan (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto San Luis (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz III (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz IV (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Cruz VI (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Trelew (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Tucumán (WMTS)"
+msgstr ""
+
+msgid "IGN orthophoto Ushuaia (WMTS)"
+msgstr ""
+
+msgid "Educational map (WMS)"
+msgstr ""
+
+msgid "Ministry of Agroindustry (WMS)"
+msgstr ""
+
+msgid "Ministry of Energy and Mining (WMS)"
+msgstr ""
msgid "AGRI black-and-white 2.5m"
msgstr ""
@@ -15448,10 +15598,10 @@ msgstr ""
msgid "SDFE DTK Kort25"
msgstr ""
-msgid "SDFE Terræn Skyggekort (40 cm)"
+msgid "SDFE Terrain Shadow Map (40 cm)"
msgstr ""
-msgid "SDFE Overflade Skyggekort (40 cm)"
+msgid "SDFE Surface Shadow Map (40 cm)"
msgstr ""
msgid "SDFE Skærmkort"
@@ -15877,6 +16027,18 @@ msgstr ""
msgid "OSMIE T.ie Land not in Counties"
msgstr ""
+msgid "Israel Hiking"
+msgstr ""
+
+msgid "Israel Hiking map"
+msgstr ""
+
+msgid "Israel MTB"
+msgstr ""
+
+msgid "Israel MTB map"
+msgstr ""
+
msgid "Lodi - Italy"
msgstr ""
@@ -18028,7 +18190,7 @@ msgid "indian"
msgstr "印度"
msgid "regional"
-msgstr "地方料理"
+msgstr "地方"
msgid "kebab"
msgstr "烤肉串"
@@ -27821,8 +27983,8 @@ msgstr "來源："
msgid "Name:"
msgstr "名稱："
-msgid "updated building info"
-msgstr "更新建築物資訊中..."
+msgid "update building info"
+msgstr ""
msgid "Tag Element"
msgstr "標記元件"
@@ -27848,8 +28010,11 @@ msgstr "區域選取工具"
msgid "Trying to detect an area at:"
msgstr "正在嘗試偵測區域於："
-msgid "Created area"
-msgstr "建立區域"
+msgid "create building"
+msgstr ""
+
+msgid "replace building"
+msgstr ""
msgid "Add address"
msgid_plural "Add addresses"
@@ -27950,6 +28115,12 @@ msgid ""
"plugin"
msgstr ""
+msgid "Replace existing buildings"
+msgstr ""
+
+msgid "Replace an existing building with the new one."
+msgstr ""
+
msgid "Debug"
msgstr "除錯"
@@ -31885,6 +32056,14 @@ msgstr "列印失敗。"
msgid "Repeat last fix"
msgstr "重複上次修正"
+msgid ""
+"The relation has incomplete members. Do you want to download them and "
+"continue with the sorting?"
+msgstr ""
+
+msgid "Incomplete Members"
+msgstr ""
+
msgid "Do you want to make the roundabout round?"
msgstr ""
@@ -31929,6 +32108,12 @@ msgstr "你想要怎麼處理？"
msgid "PT_Assistant Proceed Request"
msgstr "大眾運輸助手已處理要求"
+msgid "Bicycle and foot routes Tests"
+msgstr ""
+
+msgid "PT: There is a gap in the "
+msgstr ""
+
msgid "PT: Stop_position is not part of a way"
msgstr "大眾運輸：停車位置不是路徑的一部分"
@@ -31948,6 +32133,9 @@ msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr "檢查路線關聯是否與 大眾運數V2 相容"
+msgid "PT: Relation member roles do not match tags"
+msgstr "大眾運輸：關聯成員角色與標籤不符"
+
msgid "Fix error"
msgstr "修正錯誤"
@@ -31962,8 +32150,21 @@ msgid ""
"required"
msgstr ""
-msgid "PT: Relation member roles do not match tags"
-msgstr "大眾運輸：關聯成員角色與標籤不符"
+msgid ""
+"PT: The name of the first stop does not match the \"from\" tag of the route "
+"relation"
+msgstr ""
+
+msgid ""
+"PT: The name of the last stop does not match the \"to\" tag of the route "
+"relation"
+msgstr ""
+
+msgid "PT: The first stop of the route does not match the first way"
+msgstr ""
+
+msgid "PT: The last stop of the route does not match the last way"
+msgstr ""
msgid "PT: Route should start and end with a stop_position"
msgstr "大眾運輸：路線的開始與結束應該要是停車位置"
@@ -33166,6 +33367,9 @@ msgstr "啟用「待修正」插件"
msgid "Auto delete layer"
msgstr "自動刪除圖層"
+msgid "Set default url"
+msgstr ""
+
msgid "Select the checkbox to:"
msgstr ""
@@ -33190,6 +33394,15 @@ msgstr ""
msgid "Select a task ..."
msgstr ""
+msgid "Setting default URL"
+msgstr ""
+
+msgid "Enter the new URL"
+msgstr ""
+
+msgid "Setting new URL: "
+msgstr ""
+
msgid "Set download area (m²)"
msgstr "設定下載面積 (平方公尺)"
diff --git a/netbeans/nbproject/project.properties b/netbeans/nbproject/project.properties
index b6e605b..978c16f 100644
--- a/netbeans/nbproject/project.properties
+++ b/netbeans/nbproject/project.properties
@@ -30,14 +30,14 @@ dist.dir=dist
dist.jar=${dist.dir}/josm.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
-excludes=org/apache/commons/compress/compressors/brotli/**,org/apache/commons/compress/compressors/lz4/**,org/apache/commons/compress/compressors/lz77support/**,org/apache/commons/compress/compressors/lzma/**,org/apache/commons/compress/compressors/xz/**,org/apache/commons/compress/compressors/CompressorStreamFactory.java,org/apache/commons/compress/compressors/deflate/**,org/apache/commons/compress/compressors/gzip/**,org/apache/commons/compress/compressors/lzw/**,org/apache/commons/com [...]
+excludes=org/apache/commons/compress/compressors/CompressorException.java,org/apache/commons/compress/compressors/CompressorStreamFactory.java,org/apache/commons/compress/compressors/CompressorStreamProvider.java,org/apache/commons/compress/compressors/FileNameUtil.java,org/apache/commons/compress/compressors/brotli/**,org/apache/commons/compress/compressors/bzip2/BZip2Utils.java,org/apache/commons/compress/compressors/deflate/**,org/apache/commons/compress/compressors/gzip/**,org/apache [...]
file.reference.commons-collections-3.2.2.jar=../test/lib/unitils-core/commons-collections-3.2.2.jar
file.reference.commons-lang-2.6.jar=../test/lib/unitils-core/commons-lang-2.6.jar
file.reference.commons-logging-1.1.3.jar=../test/lib/unitils-core/commons-logging-1.1.3.jar
file.reference.commons-testing-2.1.0.jar=../test/lib/commons-testing/commons-testing-2.1.0.jar
file.reference.core-src=../src
file.reference.debug-1.0.jar=../test/lib/fest/debug-1.0.jar
-file.reference.equalsverifier-2.3.jar=../test/lib/equalsverifier-2.3.jar
+file.reference.equalsverifier-2.3.1.jar=../test/lib/equalsverifier-2.3.1.jar
file.reference.fest-assert-1.0.jar=../test/lib/fest/fest-assert-1.0.jar
file.reference.fest-reflect-1.1.jar=../test/lib/fest/fest-reflect-1.1.jar
file.reference.fest-swing-1.1.jar=../test/lib/fest/fest-swing-1.1.jar
@@ -72,7 +72,7 @@ javac.test.classpath=\
${build.classes.dir}:\
${file.reference.junit-4.12.jar}:\
${file.reference.jfcunit.jar}:\
- ${file.reference.equalsverifier-2.3.jar}:\
+ ${file.reference.equalsverifier-2.3.1.jar}:\
${file.reference.hamcrest-core-1.3.jar}:\
${file.reference.MRJToolkitStubs-1.0.jar}:\
${file.reference.debug-1.0.jar}:\
diff --git a/src/org/openstreetmap/josm/Main.java b/src/org/openstreetmap/josm/Main.java
index 664f991..cbfb54a 100644
--- a/src/org/openstreetmap/josm/Main.java
+++ b/src/org/openstreetmap/josm/Main.java
@@ -1158,7 +1158,7 @@ public abstract class Main {
* @since 11904
*/
public static boolean addAndFireMapFrameListener(MapFrameListener listener) {
- return mainPanel.addAndFireMapFrameListener(listener);
+ return mainPanel != null && mainPanel.addAndFireMapFrameListener(listener);
}
/**
@@ -1169,7 +1169,7 @@ public abstract class Main {
* @since 5957
*/
public static boolean addMapFrameListener(MapFrameListener listener) {
- return mainPanel.addMapFrameListener(listener);
+ return mainPanel != null && mainPanel.addMapFrameListener(listener);
}
/**
@@ -1179,7 +1179,7 @@ public abstract class Main {
* @since 5957
*/
public static boolean removeMapFrameListener(MapFrameListener listener) {
- return mainPanel.removeMapFrameListener(listener);
+ return mainPanel != null && mainPanel.removeMapFrameListener(listener);
}
/**
diff --git a/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java b/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
index a414c35..255312d 100644
--- a/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
+++ b/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
@@ -93,7 +93,7 @@ public class AddImageryLayerAction extends JosmAction implements AdaptableAction
switch(info.getImageryType()) {
case WMS_ENDPOINT:
// convert to WMS type
- return getWMSLayerInfo();
+ return getWMSLayerInfo(info);
case WMTS:
// specify which layer to use
DefaultLayer layerId = new WMTSTileSource(info).userSelectLayer();
@@ -151,7 +151,14 @@ public class AddImageryLayerAction extends JosmAction implements AdaptableAction
}
}
- protected ImageryInfo getWMSLayerInfo() throws IOException, WMSGetCapabilitiesException {
+ /**
+ * Asks user to choose a WMS layer from a WMS endpoint.
+ * @param info the WMS endpoint.
+ * @return chosen WMS layer, or null
+ * @throws IOException if any I/O error occurs while contacting the WMS endpoint
+ * @throws WMSGetCapabilitiesException if the WMS getCapabilities request fails
+ */
+ protected static ImageryInfo getWMSLayerInfo(ImageryInfo info) throws IOException, WMSGetCapabilitiesException {
CheckParameterUtil.ensureThat(ImageryType.WMS_ENDPOINT.equals(info.getImageryType()), "wms_endpoint imagery type expected");
final WMSImagery wms = new WMSImagery();
diff --git a/src/org/openstreetmap/josm/actions/AlignInLineAction.java b/src/org/openstreetmap/josm/actions/AlignInLineAction.java
index 1046001..d918f72 100644
--- a/src/org/openstreetmap/josm/actions/AlignInLineAction.java
+++ b/src/org/openstreetmap/josm/actions/AlignInLineAction.java
@@ -172,6 +172,7 @@ public final class AlignInLineAction extends JosmAction {
DataSet ds = getLayerManager().getEditDataSet();
List<Node> selectedNodes = new ArrayList<>(ds.getSelectedNodes());
List<Way> selectedWays = new ArrayList<>(ds.getSelectedWays());
+ selectedWays.removeIf(OsmPrimitive::isIncomplete);
try {
Command cmd;
diff --git a/src/org/openstreetmap/josm/actions/CombineWayAction.java b/src/org/openstreetmap/josm/actions/CombineWayAction.java
index ad6b4dc..e7d4e9a 100644
--- a/src/org/openstreetmap/josm/actions/CombineWayAction.java
+++ b/src/org/openstreetmap/josm/actions/CombineWayAction.java
@@ -10,15 +10,9 @@ import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.Stack;
import java.util.stream.Collectors;
import javax.swing.JOptionPane;
@@ -31,6 +25,7 @@ import org.openstreetmap.josm.command.SequenceCommand;
import org.openstreetmap.josm.corrector.ReverseWayTagCorrector;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.NodeGraph;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.TagCollection;
import org.openstreetmap.josm.data.osm.Way;
@@ -111,6 +106,11 @@ public class CombineWayAction extends JosmAction {
// remove duplicates, preserving order
ways = new LinkedHashSet<>(ways);
+ // remove incomplete ways
+ ways.removeIf(OsmPrimitive::isIncomplete);
+ // we need at least two ways
+ if (ways.size() < 2)
+ return null;
List<DataSet> dataSets = ways.stream().map(Way::getDataSet).distinct().collect(Collectors.toList());
if (dataSets.size() != 1) {
@@ -249,357 +249,10 @@ public class CombineWayAction extends JosmAction {
protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
int numWays = 0;
for (OsmPrimitive osm : selection) {
- if (osm instanceof Way) {
- numWays++;
+ if (osm instanceof Way && !osm.isIncomplete() && ++numWays >= 2) {
+ break;
}
}
setEnabled(numWays >= 2);
}
-
- /**
- * A pair of nodes.
- */
- public static class NodePair {
- private final Node a;
- private final Node b;
-
- /**
- * Constructs a new {@code NodePair}.
- * @param a The first node
- * @param b The second node
- */
- public NodePair(Node a, Node b) {
- this.a = a;
- this.b = b;
- }
-
- /**
- * Constructs a new {@code NodePair}.
- * @param pair An existing {@code Pair} of nodes
- */
- public NodePair(Pair<Node, Node> pair) {
- this(pair.a, pair.b);
- }
-
- /**
- * Replies the first node.
- * @return The first node
- */
- public Node getA() {
- return a;
- }
-
- /**
- * Replies the second node
- * @return The second node
- */
- public Node getB() {
- return b;
- }
-
- public boolean isSuccessorOf(NodePair other) {
- return other.getB() == a;
- }
-
- public boolean isPredecessorOf(NodePair other) {
- return b == other.getA();
- }
-
- public NodePair swap() {
- return new NodePair(b, a);
- }
-
- @Override
- public String toString() {
- return new StringBuilder()
- .append('[')
- .append(a.getId())
- .append(',')
- .append(b.getId())
- .append(']')
- .toString();
- }
-
- /**
- * Determines if this pair contains the given node.
- * @param n The node to look for
- * @return {@code true} if {@code n} is in the pair, {@code false} otherwise
- */
- public boolean contains(Node n) {
- return a == n || b == n;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(a, b);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- NodePair nodePair = (NodePair) obj;
- return Objects.equals(a, nodePair.a) &&
- Objects.equals(b, nodePair.b);
- }
- }
-
- public static class NodeGraph {
- public static List<NodePair> buildNodePairs(Way way, boolean directed) {
- List<NodePair> pairs = new ArrayList<>();
- for (Pair<Node, Node> pair: way.getNodePairs(false /* don't sort */)) {
- pairs.add(new NodePair(pair));
- if (!directed) {
- pairs.add(new NodePair(pair).swap());
- }
- }
- return pairs;
- }
-
- public static List<NodePair> buildNodePairs(List<Way> ways, boolean directed) {
- List<NodePair> pairs = new ArrayList<>();
- for (Way w: ways) {
- pairs.addAll(buildNodePairs(w, directed));
- }
- return pairs;
- }
-
- public static List<NodePair> eliminateDuplicateNodePairs(List<NodePair> pairs) {
- List<NodePair> cleaned = new ArrayList<>();
- for (NodePair p: pairs) {
- if (!cleaned.contains(p) && !cleaned.contains(p.swap())) {
- cleaned.add(p);
- }
- }
- return cleaned;
- }
-
- public static NodeGraph createDirectedGraphFromNodePairs(List<NodePair> pairs) {
- NodeGraph graph = new NodeGraph();
- for (NodePair pair: pairs) {
- graph.add(pair);
- }
- return graph;
- }
-
- public static NodeGraph createDirectedGraphFromWays(Collection<Way> ways) {
- NodeGraph graph = new NodeGraph();
- for (Way w: ways) {
- graph.add(buildNodePairs(w, true /* directed */));
- }
- return graph;
- }
-
- /**
- * Create an undirected graph from the given node pairs.
- * @param pairs Node pairs to build the graph from
- * @return node graph structure
- */
- public static NodeGraph createUndirectedGraphFromNodeList(List<NodePair> pairs) {
- NodeGraph graph = new NodeGraph();
- for (NodePair pair: pairs) {
- graph.add(pair);
- graph.add(pair.swap());
- }
- return graph;
- }
-
- /**
- * Create an undirected graph from the given ways, but prevent reversing of all
- * non-new ways by fix one direction.
- * @param ways Ways to build the graph from
- * @return node graph structure
- * @since 8181
- */
- public static NodeGraph createUndirectedGraphFromNodeWays(Collection<Way> ways) {
- NodeGraph graph = new NodeGraph();
- for (Way w: ways) {
- graph.add(buildNodePairs(w, false /* undirected */));
- }
- return graph;
- }
-
- public static NodeGraph createNearlyUndirectedGraphFromNodeWays(Collection<Way> ways) {
- boolean dir = true;
- NodeGraph graph = new NodeGraph();
- for (Way w: ways) {
- if (!w.isNew()) {
- /* let the first non-new way give the direction (see #5880) */
- graph.add(buildNodePairs(w, dir));
- dir = false;
- } else {
- graph.add(buildNodePairs(w, false /* undirected */));
- }
- }
- return graph;
- }
-
- private final Set<NodePair> edges;
- private int numUndirectedEges;
- private final Map<Node, List<NodePair>> successors = new LinkedHashMap<>();
- private final Map<Node, List<NodePair>> predecessors = new LinkedHashMap<>();
-
- protected void rememberSuccessor(NodePair pair) {
- if (successors.containsKey(pair.getA())) {
- if (!successors.get(pair.getA()).contains(pair)) {
- successors.get(pair.getA()).add(pair);
- }
- } else {
- List<NodePair> l = new ArrayList<>();
- l.add(pair);
- successors.put(pair.getA(), l);
- }
- }
-
- protected void rememberPredecessors(NodePair pair) {
- if (predecessors.containsKey(pair.getB())) {
- if (!predecessors.get(pair.getB()).contains(pair)) {
- predecessors.get(pair.getB()).add(pair);
- }
- } else {
- List<NodePair> l = new ArrayList<>();
- l.add(pair);
- predecessors.put(pair.getB(), l);
- }
- }
-
- protected boolean isTerminalNode(Node n) {
- if (successors.get(n) == null) return false;
- if (successors.get(n).size() != 1) return false;
- if (predecessors.get(n) == null) return true;
- if (predecessors.get(n).size() == 1) {
- NodePair p1 = successors.get(n).get(0);
- NodePair p2 = predecessors.get(n).get(0);
- return p1.equals(p2.swap());
- }
- return false;
- }
-
- protected void prepare() {
- Set<NodePair> undirectedEdges = new LinkedHashSet<>();
- successors.clear();
- predecessors.clear();
-
- for (NodePair pair: edges) {
- if (!undirectedEdges.contains(pair) && !undirectedEdges.contains(pair.swap())) {
- undirectedEdges.add(pair);
- }
- rememberSuccessor(pair);
- rememberPredecessors(pair);
- }
- numUndirectedEges = undirectedEdges.size();
- }
-
- /**
- * Constructs a new {@code NodeGraph}.
- */
- public NodeGraph() {
- edges = new LinkedHashSet<>();
- }
-
- public void add(NodePair pair) {
- if (!edges.contains(pair)) {
- edges.add(pair);
- }
- }
-
- public void add(List<NodePair> pairs) {
- for (NodePair pair: pairs) {
- add(pair);
- }
- }
-
- protected Set<Node> getTerminalNodes() {
- Set<Node> ret = new LinkedHashSet<>();
- for (Node n: getNodes()) {
- if (isTerminalNode(n)) {
- ret.add(n);
- }
- }
- return ret;
- }
-
- protected List<NodePair> getOutboundPairs(NodePair pair) {
- return getOutboundPairs(pair.getB());
- }
-
- protected List<NodePair> getOutboundPairs(Node node) {
- return Optional.ofNullable(successors.get(node)).orElseGet(Collections::emptyList);
- }
-
- protected Set<Node> getNodes() {
- Set<Node> nodes = new LinkedHashSet<>(2 * edges.size());
- for (NodePair pair: edges) {
- nodes.add(pair.getA());
- nodes.add(pair.getB());
- }
- return nodes;
- }
-
- protected boolean isSpanningWay(Stack<NodePair> way) {
- return numUndirectedEges == way.size();
- }
-
- protected List<Node> buildPathFromNodePairs(Stack<NodePair> path) {
- List<Node> ret = new LinkedList<>();
- for (NodePair pair: path) {
- ret.add(pair.getA());
- }
- ret.add(path.peek().getB());
- return ret;
- }
-
- /**
- * Tries to find a spanning path starting from node <code>startNode</code>.
- *
- * Traverses the path in depth-first order.
- *
- * @param startNode the start node
- * @return the spanning path; null, if no path is found
- */
- protected List<Node> buildSpanningPath(Node startNode) {
- if (startNode == null)
- return null;
- Stack<NodePair> path = new Stack<>();
- Stack<NodePair> nextPairs = new Stack<>();
- nextPairs.addAll(getOutboundPairs(startNode));
- while (!nextPairs.isEmpty()) {
- NodePair cur = nextPairs.pop();
- if (!path.contains(cur) && !path.contains(cur.swap())) {
- while (!path.isEmpty() && !path.peek().isPredecessorOf(cur)) {
- path.pop();
- }
- path.push(cur);
- if (isSpanningWay(path)) return buildPathFromNodePairs(path);
- nextPairs.addAll(getOutboundPairs(path.peek()));
- }
- }
- return null;
- }
-
- /**
- * Tries to find a path through the graph which visits each edge (i.e.
- * the segment of a way) exactly once.
- *
- * @return the path; null, if no path was found
- */
- public List<Node> buildSpanningPath() {
- prepare();
- // try to find a path from each "terminal node", i.e. from a
- // node which is connected by exactly one undirected edges (or
- // two directed edges in opposite direction) to the graph. A
- // graph built up from way segments is likely to include such
- // nodes, unless all ways are closed.
- // In the worst case this loops over all nodes which is very slow for large ways.
- //
- Set<Node> nodes = getTerminalNodes();
- nodes = nodes.isEmpty() ? getNodes() : nodes;
- for (Node n: nodes) {
- List<Node> path = buildSpanningPath(n);
- if (path != null)
- return path;
- }
- return null;
- }
- }
}
diff --git a/src/org/openstreetmap/josm/actions/DeleteAction.java b/src/org/openstreetmap/josm/actions/DeleteAction.java
index 78c1852..231631d 100644
--- a/src/org/openstreetmap/josm/actions/DeleteAction.java
+++ b/src/org/openstreetmap/josm/actions/DeleteAction.java
@@ -31,7 +31,7 @@ public final class DeleteAction extends JosmAction {
public void actionPerformed(ActionEvent e) {
if (!isEnabled() || !Main.map.mapView.isActiveLayerVisible())
return;
- org.openstreetmap.josm.actions.mapmode.DeleteAction.doActionPerformed(e);
+ Main.map.mapModeDelete.doActionPerformed(e);
}
@Override
diff --git a/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java b/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java
index 9babf48..7bb7f44 100644
--- a/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java
+++ b/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java
@@ -8,6 +8,7 @@ import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
@@ -21,11 +22,13 @@ import javax.swing.JRadioButton;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
import org.openstreetmap.josm.gui.layer.WMSLayer;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.gui.widgets.UrlLabel;
+import org.openstreetmap.josm.io.imagery.WMSImagery.WMSGetCapabilitiesException;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.Shortcut;
@@ -231,8 +234,17 @@ public class MapRectifierWMSmenuAction extends JosmAction {
* @throws IllegalStateException if imagery time is neither HTML nor WMS
*/
private static void addWMSLayer(String title, String url) {
- WMSLayer layer = new WMSLayer(new ImageryInfo(title, url));
- Main.getLayerManager().addLayer(layer);
+ ImageryInfo info = new ImageryInfo(title, url);
+ if (info.getImageryType() == ImageryType.WMS_ENDPOINT) {
+ try {
+ info = AddImageryLayerAction.getWMSLayerInfo(info);
+ } catch (IOException | WMSGetCapabilitiesException e) {
+ Main.error(e);
+ JOptionPane.showMessageDialog(Main.parent, e.getMessage(), tr("No valid WMS URL or id"), JOptionPane.ERROR_MESSAGE);
+ return;
+ }
+ }
+ Main.getLayerManager().addLayer(new WMSLayer(info));
}
@Override
diff --git a/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java b/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
index 02c8e43..6432e34 100644
--- a/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
+++ b/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
@@ -193,7 +193,9 @@ public final class OrthogonalizeAction extends JosmAction {
if (p instanceof Node) {
nodeList.add((Node) p);
} else if (p instanceof Way) {
- wayDataList.add(new WayData(((Way) p).getNodes()));
+ if (!p.isIncomplete()) {
+ wayDataList.add(new WayData(((Way) p).getNodes()));
+ }
} else {
throw new InvalidUserInputException(tr("Selection must consist only of ways and nodes."));
}
diff --git a/src/org/openstreetmap/josm/actions/PasteTagsAction.java b/src/org/openstreetmap/josm/actions/PasteTagsAction.java
index a62cadd..3014bee 100644
--- a/src/org/openstreetmap/josm/actions/PasteTagsAction.java
+++ b/src/org/openstreetmap/josm/actions/PasteTagsAction.java
@@ -23,7 +23,7 @@ import org.openstreetmap.josm.tools.Shortcut;
*/
public final class PasteTagsAction extends JosmAction {
- private static final String help = ht("/Action/PasteTags");
+ private static final String HELP = ht("/Action/PasteTags");
private final OsmTransferHandler transferHandler = new OsmTransferHandler();
/**
@@ -34,7 +34,7 @@ public final class PasteTagsAction extends JosmAction {
tr("Apply tags of contents of paste buffer to all selected items."),
Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")),
KeyEvent.VK_V, Shortcut.CTRL_SHIFT), true);
- putValue("help", help);
+ putValue("help", HELP);
}
@Override
diff --git a/src/org/openstreetmap/josm/actions/ReverseWayAction.java b/src/org/openstreetmap/josm/actions/ReverseWayAction.java
index beedc69..1717600 100644
--- a/src/org/openstreetmap/josm/actions/ReverseWayAction.java
+++ b/src/org/openstreetmap/josm/actions/ReverseWayAction.java
@@ -9,6 +9,7 @@ import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
@@ -112,7 +113,8 @@ public final class ReverseWayAction extends JosmAction {
if (!isEnabled() || ds == null)
return;
- final Collection<Way> sel = ds.getSelectedWays();
+ final Collection<Way> sel = new LinkedHashSet<>(ds.getSelectedWays());
+ sel.removeIf(Way::isIncomplete);
if (sel.isEmpty()) {
new Notification(
tr("Please select at least one way."))
@@ -162,6 +164,6 @@ public final class ReverseWayAction extends JosmAction {
@Override
protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
- setEnabled(selection.stream().anyMatch(Way.class::isInstance));
+ setEnabled(selection.stream().anyMatch(o -> o instanceof Way && !o.isIncomplete()));
}
}
diff --git a/src/org/openstreetmap/josm/actions/SessionLoadAction.java b/src/org/openstreetmap/josm/actions/SessionLoadAction.java
index 3109d72..65d3de1 100644
--- a/src/org/openstreetmap/josm/actions/SessionLoadAction.java
+++ b/src/org/openstreetmap/josm/actions/SessionLoadAction.java
@@ -19,16 +19,18 @@ import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.ViewportData;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.gui.util.FileFilterAllFiles;
import org.openstreetmap.josm.gui.widgets.AbstractFileChooser;
import org.openstreetmap.josm.io.IllegalDataException;
import org.openstreetmap.josm.io.session.SessionImporter;
import org.openstreetmap.josm.io.session.SessionReader;
+import org.openstreetmap.josm.io.session.SessionReader.SessionProjectionChoiceData;
+import org.openstreetmap.josm.io.session.SessionReader.SessionViewportData;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.Utils;
@@ -72,7 +74,8 @@ public class SessionLoadAction extends DiskAccessAction {
private List<Layer> layers;
private Layer active;
private List<Runnable> postLoadTasks;
- private ViewportData viewport;
+ private SessionViewportData viewport;
+ private SessionProjectionChoiceData projectionChoice;
/**
* Constructs a new {@code Loader} for local session file.
@@ -115,6 +118,12 @@ public class SessionLoadAction extends DiskAccessAction {
SwingUtilities.invokeLater(() -> {
if (canceled)
return;
+ if (projectionChoice != null) {
+ ProjectionPreference.setProjection(
+ projectionChoice.getProjectionChoiceId(),
+ projectionChoice.getSubPreferences(),
+ false);
+ }
addLayers();
runPostLoadTasks();
});
@@ -131,8 +140,8 @@ public class SessionLoadAction extends DiskAccessAction {
if (active != null) {
Main.getLayerManager().setActiveLayer(active);
}
- if (noMap) {
- Main.map.mapView.scheduleZoomTo(viewport);
+ if (noMap && viewport != null) {
+ Main.map.mapView.scheduleZoomTo(viewport.getEastNorthViewport(Main.getProjection()));
}
}
}
@@ -168,6 +177,7 @@ public class SessionLoadAction extends DiskAccessAction {
active = reader.getActive();
postLoadTasks = reader.getPostLoadTasks();
viewport = reader.getViewport();
+ projectionChoice = reader.getProjectionChoice();
} finally {
if (tempFile) {
Utils.deleteFile(file);
diff --git a/src/org/openstreetmap/josm/actions/SimplifyWayAction.java b/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
index 397c77e..3686d7b 100644
--- a/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
+++ b/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
@@ -101,6 +101,7 @@ public class SimplifyWayAction extends JosmAction {
ds.beginUpdate();
try {
List<Way> ways = OsmPrimitive.getFilteredList(ds.getSelected(), Way.class);
+ ways.removeIf(OsmPrimitive::isIncomplete);
if (ways.isEmpty()) {
alertSelectAtLeastOneWay();
return;
diff --git a/src/org/openstreetmap/josm/actions/UnGlueAction.java b/src/org/openstreetmap/josm/actions/UnGlueAction.java
index b1128d7..14838a5 100644
--- a/src/org/openstreetmap/josm/actions/UnGlueAction.java
+++ b/src/org/openstreetmap/josm/actions/UnGlueAction.java
@@ -580,7 +580,6 @@ public class UnGlueAction extends JosmAction {
if (n == selectedNode) {
if (seen) {
Node newNode = new Node(n, true /* clear OSM ID */);
- newNodes.add(newNode);
cmds.add(new AddCommand(newNode));
newNodes.add(newNode);
addNodes.add(newNode);
diff --git a/src/org/openstreetmap/josm/actions/UploadAction.java b/src/org/openstreetmap/josm/actions/UploadAction.java
index fc0d3d2..c99099a 100644
--- a/src/org/openstreetmap/josm/actions/UploadAction.java
+++ b/src/org/openstreetmap/josm/actions/UploadAction.java
@@ -51,34 +51,34 @@ public class UploadAction extends JosmAction {
* dialog is the last thing shown before upload really starts; on occasion
* however, a plugin might also want to insert something after that.
*/
- private static final List<UploadHook> uploadHooks = new LinkedList<>();
- private static final List<UploadHook> lateUploadHooks = new LinkedList<>();
+ private static final List<UploadHook> UPLOAD_HOOKS = new LinkedList<>();
+ private static final List<UploadHook> LATE_UPLOAD_HOOKS = new LinkedList<>();
static {
/**
* Calls validator before upload.
*/
- uploadHooks.add(new ValidateUploadHook());
+ UPLOAD_HOOKS.add(new ValidateUploadHook());
/**
* Fixes database errors
*/
- uploadHooks.add(new FixDataHook());
+ UPLOAD_HOOKS.add(new FixDataHook());
/**
* Checks server capabilities before upload.
*/
- uploadHooks.add(new ApiPreconditionCheckerHook());
+ UPLOAD_HOOKS.add(new ApiPreconditionCheckerHook());
/**
* Adjusts the upload order of new relations
*/
- uploadHooks.add(new RelationUploadOrderHook());
+ UPLOAD_HOOKS.add(new RelationUploadOrderHook());
/**
* Removes discardable tags like created_by on modified objects
*/
- lateUploadHooks.add(new DiscardTagsHook());
+ LATE_UPLOAD_HOOKS.add(new DiscardTagsHook());
}
/**
@@ -101,12 +101,12 @@ public class UploadAction extends JosmAction {
public static void registerUploadHook(UploadHook hook, boolean late) {
if (hook == null) return;
if (late) {
- if (!lateUploadHooks.contains(hook)) {
- lateUploadHooks.add(0, hook);
+ if (!LATE_UPLOAD_HOOKS.contains(hook)) {
+ LATE_UPLOAD_HOOKS.add(0, hook);
}
} else {
- if (!uploadHooks.contains(hook)) {
- uploadHooks.add(0, hook);
+ if (!UPLOAD_HOOKS.contains(hook)) {
+ UPLOAD_HOOKS.add(0, hook);
}
}
}
@@ -118,11 +118,11 @@ public class UploadAction extends JosmAction {
*/
public static void unregisterUploadHook(UploadHook hook) {
if (hook == null) return;
- if (uploadHooks.contains(hook)) {
- uploadHooks.remove(hook);
+ if (UPLOAD_HOOKS.contains(hook)) {
+ UPLOAD_HOOKS.remove(hook);
}
- if (lateUploadHooks.contains(hook)) {
- lateUploadHooks.remove(hook);
+ if (LATE_UPLOAD_HOOKS.contains(hook)) {
+ LATE_UPLOAD_HOOKS.remove(hook);
}
}
@@ -203,7 +203,7 @@ public class UploadAction extends JosmAction {
// FIXME: this should become an asynchronous task
//
if (apiData != null) {
- for (UploadHook hook : uploadHooks) {
+ for (UploadHook hook : UPLOAD_HOOKS) {
if (!hook.checkUpload(apiData))
return false;
}
@@ -239,7 +239,7 @@ public class UploadAction extends JosmAction {
if (dialog.isCanceled())
return;
- for (UploadHook hook : lateUploadHooks) {
+ for (UploadHook hook : LATE_UPLOAD_HOOKS) {
if (!hook.checkUpload(apiData))
return;
}
diff --git a/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java b/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
index fe55f72..466a257 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
@@ -5,7 +5,6 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Cursor;
import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.util.Collection;
@@ -26,7 +25,7 @@ import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.MainLayerManager;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.util.HighlightHelper;
-import org.openstreetmap.josm.gui.util.ModifierListener;
+import org.openstreetmap.josm.gui.util.ModifierExListener;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Shortcut;
@@ -45,7 +44,7 @@ import org.openstreetmap.josm.tools.Shortcut;
*
* @author imi
*/
-public class DeleteAction extends MapMode implements ModifierListener {
+public class DeleteAction extends MapMode implements ModifierExListener {
// Cache previous mouse event (needed when only the modifier keys are pressed but the mouse isn't moved)
private MouseEvent oldEvent;
@@ -56,7 +55,7 @@ public class DeleteAction extends MapMode implements ModifierListener {
*/
private transient WaySegment oldHighlightedWaySegment;
- private static final HighlightHelper highlightHelper = new HighlightHelper();
+ private static final HighlightHelper HIGHLIGHT_HELPER = new HighlightHelper();
private boolean drawTargetHighlight;
enum DeleteMode {
@@ -113,7 +112,7 @@ public class DeleteAction extends MapMode implements ModifierListener {
Main.map.mapView.addMouseListener(this);
Main.map.mapView.addMouseMotionListener(this);
// This is required to update the cursors when ctrl/shift/alt is pressed
- Main.map.keyDetector.addModifierListener(this);
+ Main.map.keyDetector.addModifierExListener(this);
}
@Override
@@ -121,7 +120,7 @@ public class DeleteAction extends MapMode implements ModifierListener {
super.exitMode();
Main.map.mapView.removeMouseListener(this);
Main.map.mapView.removeMouseMotionListener(this);
- Main.map.keyDetector.removeModifierListener(this);
+ Main.map.keyDetector.removeModifierExListener(this);
removeHighlighting();
}
@@ -135,15 +134,14 @@ public class DeleteAction extends MapMode implements ModifierListener {
* Invoked when the action occurs.
* @param e Action event
*/
- public static void doActionPerformed(ActionEvent e) {
+ public void doActionPerformed(ActionEvent e) {
MainLayerManager lm = Main.getLayerManager();
OsmDataLayer editLayer = lm.getEditLayer();
if (editLayer == null) {
return;
}
- boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
- boolean alt = (e.getModifiers() & (ActionEvent.ALT_MASK | InputEvent.ALT_GRAPH_MASK)) != 0;
+ updateKeyModifiers(e);
Command c;
if (ctrl) {
@@ -178,7 +176,7 @@ public class DeleteAction extends MapMode implements ModifierListener {
* removes any highlighting that may have been set beforehand.
*/
private void removeHighlighting() {
- highlightHelper.clear();
+ HIGHLIGHT_HELPER.clear();
DataSet ds = getLayerManager().getEditDataSet();
if (ds != null) {
ds.clearHighlightedWaySegments();
@@ -189,7 +187,7 @@ public class DeleteAction extends MapMode implements ModifierListener {
* handles everything related to highlighting primitives and way
* segments for the given pointer position (via MouseEvent) and modifiers.
* @param e current mouse event
- * @param modifiers mouse modifiers, not necessarly taken from the given mouse event
+ * @param modifiers extended mouse modifiers, not necessarly taken from the given mouse event
*/
private void addHighlighting(MouseEvent e, int modifiers) {
if (!drawTargetHighlight)
@@ -233,7 +231,7 @@ public class DeleteAction extends MapMode implements ModifierListener {
}
oldHighlightedWaySegment = newHighlightedWaySegment;
}
- needsRepaint |= highlightHelper.highlightOnly(newHighlights);
+ needsRepaint |= HIGHLIGHT_HELPER.highlightOnly(newHighlights);
if (needsRepaint && editLayer != null) {
editLayer.invalidate();
}
@@ -243,7 +241,7 @@ public class DeleteAction extends MapMode implements ModifierListener {
* This function handles all work related to updating the cursor and highlights
*
* @param e current mouse event
- * @param modifiers mouse modifiers, not necessarly taken from the given mouse event
+ * @param modifiers extended mouse modifiers, not necessarly taken from the given mouse event
*/
private void updateCursor(MouseEvent e, int modifiers) {
if (!Main.isDisplayingMapView())
@@ -279,7 +277,7 @@ public class DeleteAction extends MapMode implements ModifierListener {
* @param e mouse event
*/
private void giveUserFeedback(MouseEvent e) {
- giveUserFeedback(e, e.getModifiers());
+ giveUserFeedback(e, e.getModifiersEx());
}
/**
@@ -296,7 +294,7 @@ public class DeleteAction extends MapMode implements ModifierListener {
//
Main.map.mapView.requestFocus();
- Command c = buildDeleteCommands(e, e.getModifiers(), false);
+ Command c = buildDeleteCommands(e, e.getModifiersEx(), false);
if (c != null) {
Main.main.undoRedo.add(c);
}
@@ -360,7 +358,7 @@ public class DeleteAction extends MapMode implements ModifierListener {
}
private DeleteParameters getDeleteParameters(MouseEvent e, int modifiers) {
- updateKeyModifiers(modifiers);
+ updateKeyModifiersEx(modifiers);
DeleteParameters result = new DeleteParameters();
@@ -420,7 +418,7 @@ public class DeleteAction extends MapMode implements ModifierListener {
* This is required to update the cursors when ctrl/shift/alt is pressed
*/
@Override
- public void modifiersChanged(int modifiers) {
+ public void modifiersExChanged(int modifiers) {
if (oldEvent == null)
return;
// We don't have a mouse event, so we pass the old mouse event but the new modifiers.
diff --git a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
index 09799d0..61469d2 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
@@ -62,7 +62,7 @@ import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.MapViewPaintable;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.util.KeyPressReleaseListener;
-import org.openstreetmap.josm.gui.util.ModifierListener;
+import org.openstreetmap.josm.gui.util.ModifierExListener;
import org.openstreetmap.josm.tools.Geometry;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Pair;
@@ -72,7 +72,7 @@ import org.openstreetmap.josm.tools.Utils;
/**
* Mapmode to add nodes, create and extend ways.
*/
-public class DrawAction extends MapMode implements MapViewPaintable, DataSelectionListener, KeyPressReleaseListener, ModifierListener {
+public class DrawAction extends MapMode implements MapViewPaintable, DataSelectionListener, KeyPressReleaseListener, ModifierExListener {
/**
* If this property is set, the draw action moves the viewport when adding new points.
@@ -278,7 +278,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
SelectionEventManager.getInstance().addSelectionListenerForEdt(this);
Main.map.keyDetector.addKeyListener(this);
- Main.map.keyDetector.addModifierListener(this);
+ Main.map.keyDetector.addModifierExListener(this);
ignoreNextKeyRelease = true;
}
@@ -298,17 +298,17 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
removeHighlighting();
Main.map.keyDetector.removeKeyListener(this);
- Main.map.keyDetector.removeModifierListener(this);
+ Main.map.keyDetector.removeModifierExListener(this);
}
/**
* redraw to (possibly) get rid of helper line if selection changes.
*/
@Override
- public void modifiersChanged(int modifiers) {
+ public void modifiersExChanged(int modifiers) {
if (!Main.isDisplayingMapView() || !Main.map.mapView.isActiveLayerDrawable())
return;
- updateKeyModifiers(modifiers);
+ updateKeyModifiersEx(modifiers);
computeHelperLine();
addHighlighting();
}
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java b/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
index 61c191c..f715ed8 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
@@ -38,6 +38,7 @@ import org.openstreetmap.josm.command.MoveCommand;
import org.openstreetmap.josm.command.SequenceCommand;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.osm.DataIntegrityProblemException;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
@@ -52,7 +53,7 @@ import org.openstreetmap.josm.gui.layer.MapViewPaintable;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.util.KeyPressReleaseListener;
-import org.openstreetmap.josm.gui.util.ModifierListener;
+import org.openstreetmap.josm.gui.util.ModifierExListener;
import org.openstreetmap.josm.tools.Geometry;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Shortcut;
@@ -60,7 +61,7 @@ import org.openstreetmap.josm.tools.Shortcut;
/**
* Makes a rectangle from a line, or modifies a rectangle.
*/
-public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPressReleaseListener, ModifierListener {
+public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPressReleaseListener, ModifierExListener {
enum Mode { extrude, translate, select, create_new, translate_node }
@@ -294,7 +295,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPress
Main.map.mapView.addMouseMotionListener(this);
ignoreNextKeyRelease = true;
Main.map.keyDetector.addKeyListener(this);
- Main.map.keyDetector.addModifierListener(this);
+ Main.map.keyDetector.addModifierExListener(this);
}
@Override
@@ -323,7 +324,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPress
Main.map.mapView.removeTemporaryLayer(this);
dualAlignCheckboxMenuItem.getAction().setEnabled(false);
Main.map.keyDetector.removeKeyListener(this);
- Main.map.keyDetector.removeModifierListener(this);
+ Main.map.keyDetector.removeModifierExListener(this);
super.exitMode();
}
@@ -335,10 +336,10 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPress
* This method is called to indicate different modes via cursor when the Alt/Ctrl/Shift modifier is pressed,
*/
@Override
- public void modifiersChanged(int modifiers) {
+ public void modifiersExChanged(int modifiers) {
if (!Main.isDisplayingMapView() || !Main.map.mapView.isActiveLayerDrawable())
return;
- updateKeyModifiers(modifiers);
+ updateKeyModifiersEx(modifiers);
if (mode == Mode.select) {
Main.map.mapView.setNewCursor(ctrl ? cursorTranslate : alt ? cursorCreateNew : shift ? cursorCreateNodes : cursor, this);
}
@@ -534,8 +535,13 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPress
// double click adds a new node
addNewNode(e);
} else if (e.getPoint().distance(initialMousePos) > initialMoveThreshold && newN1en != null && selectedSegment != null) {
- // main extrusion commands
- performExtrusion();
+ try {
+ // main extrusion commands
+ performExtrusion();
+ } catch (DataIntegrityProblemException ex) {
+ // Can occur if calling undo while extruding, see #12870
+ Main.error(ex);
+ }
}
} else if (mode == Mode.translate || mode == Mode.translate_node) {
//Commit translate
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
index bee1b62..7afd7b6 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
@@ -45,7 +45,7 @@ import org.openstreetmap.josm.gui.draw.SymbolShape;
import org.openstreetmap.josm.gui.layer.AbstractMapViewPaintable;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.util.ModifierListener;
+import org.openstreetmap.josm.gui.util.ModifierExListener;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Pair;
import org.openstreetmap.josm.tools.Shortcut;
@@ -54,7 +54,7 @@ import org.openstreetmap.josm.tools.Shortcut;
* @author Alexander Kachkaev <alexander at kachkaev.ru>, 2011
*/
public class ImproveWayAccuracyAction extends MapMode implements
- SelectionChangedListener, ModifierListener {
+ SelectionChangedListener, ModifierExListener {
private static final String CROSSHAIR = "crosshair";
@@ -149,7 +149,7 @@ public class ImproveWayAccuracyAction extends MapMode implements
Main.map.mapView.addTemporaryLayer(temporaryLayer);
DataSet.addSelectionListener(this);
- Main.map.keyDetector.addModifierListener(this);
+ Main.map.keyDetector.addModifierExListener(this);
}
@Override
@@ -166,7 +166,7 @@ public class ImproveWayAccuracyAction extends MapMode implements
Main.map.mapView.removeTemporaryLayer(temporaryLayer);
DataSet.removeSelectionListener(this);
- Main.map.keyDetector.removeModifierListener(this);
+ Main.map.keyDetector.removeModifierExListener(this);
temporaryLayer.invalidate();
}
@@ -343,11 +343,11 @@ public class ImproveWayAccuracyAction extends MapMode implements
// Event handlers
// -------------------------------------------------------------------------
@Override
- public void modifiersChanged(int modifiers) {
+ public void modifiersExChanged(int modifiers) {
if (!Main.isDisplayingMapView() || !Main.map.mapView.isActiveLayerDrawable()) {
return;
}
- updateKeyModifiers(modifiers);
+ updateKeyModifiersEx(modifiers);
updateCursorDependentObjectsIfNeeded();
updateCursor();
updateStatusLine();
diff --git a/src/org/openstreetmap/josm/actions/mapmode/MapMode.java b/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
index 9c67491..3226111 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
@@ -112,8 +112,10 @@ public abstract class MapMode extends JosmAction implements MouseListener, Mouse
}
protected void updateStatusLine() {
- Main.map.statusLine.setHelpText(getModeHelpText());
- Main.map.statusLine.repaint();
+ if (Main.map != null && Main.map.statusLine != null) {
+ Main.map.statusLine.setHelpText(getModeHelpText());
+ Main.map.statusLine.repaint();
+ }
}
/**
@@ -147,20 +149,78 @@ public abstract class MapMode extends JosmAction implements MouseListener, Mouse
return l != null;
}
+ /**
+ * Update internal ctrl, alt, shift mask from given input event.
+ * @param e input event
+ */
protected void updateKeyModifiers(InputEvent e) {
- updateKeyModifiers(e.getModifiers());
+ updateKeyModifiersEx(e.getModifiersEx());
}
+ /**
+ * Update internal ctrl, alt, shift mask from given mouse event.
+ * @param e mouse event
+ */
protected void updateKeyModifiers(MouseEvent e) {
- updateKeyModifiers(e.getModifiers());
+ updateKeyModifiersEx(e.getModifiersEx());
}
+ /**
+ * Update internal ctrl, alt, shift mask from given action event.
+ * @param e action event
+ * @since 12526
+ */
+ protected void updateKeyModifiers(ActionEvent e) {
+ // ActionEvent does not have a getModifiersEx() method like other events :(
+ updateKeyModifiersEx(mapOldModifiers(e.getModifiers()));
+ }
+
+ /**
+ * Update internal ctrl, alt, shift mask from given modifiers mask.
+ * @param modifiers event modifiers mask
+ * @deprecated use {@link #updateKeyModifiersEx} instead
+ */
+ @Deprecated
protected void updateKeyModifiers(int modifiers) {
ctrl = (modifiers & ActionEvent.CTRL_MASK) != 0;
alt = (modifiers & (ActionEvent.ALT_MASK | InputEvent.ALT_GRAPH_MASK)) != 0;
shift = (modifiers & ActionEvent.SHIFT_MASK) != 0;
}
+ /**
+ * Update internal ctrl, alt, shift mask from given extended modifiers mask.
+ * @param modifiers event extended modifiers mask
+ * @since 12517
+ */
+ protected void updateKeyModifiersEx(int modifiers) {
+ ctrl = (modifiers & InputEvent.CTRL_DOWN_MASK) != 0;
+ alt = (modifiers & (InputEvent.ALT_DOWN_MASK | InputEvent.ALT_GRAPH_DOWN_MASK)) != 0;
+ shift = (modifiers & InputEvent.SHIFT_DOWN_MASK) != 0;
+ }
+
+ /**
+ * Map old (pre jdk 1.4) modifiers to extended modifiers (only for Ctrl, Alt, Shift).
+ * @param modifiers old modifiers
+ * @return extended modifiers
+ */
+ @SuppressWarnings("deprecation")
+ private static int mapOldModifiers(int modifiers) {
+ if ((modifiers & InputEvent.CTRL_MASK) != 0) {
+ modifiers |= InputEvent.CTRL_DOWN_MASK;
+ }
+ if ((modifiers & InputEvent.ALT_MASK) != 0) {
+ modifiers |= InputEvent.ALT_DOWN_MASK;
+ }
+ if ((modifiers & InputEvent.ALT_GRAPH_MASK) != 0) {
+ modifiers |= InputEvent.ALT_GRAPH_DOWN_MASK;
+ }
+ if ((modifiers & InputEvent.SHIFT_MASK) != 0) {
+ modifiers |= InputEvent.SHIFT_DOWN_MASK;
+ }
+
+ return modifiers;
+ }
+
protected void requestFocusInMapView() {
if (isEnabled()) {
// request focus in order to enable the expected keyboard shortcuts (see #8710)
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java b/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
index aaaf2ab..a7caf34 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
@@ -46,7 +46,7 @@ import org.openstreetmap.josm.gui.draw.MapViewPath;
import org.openstreetmap.josm.gui.layer.AbstractMapViewPaintable;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.util.ModifierListener;
+import org.openstreetmap.josm.gui.util.ModifierExListener;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.Geometry;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -89,7 +89,7 @@ import org.openstreetmap.josm.tools.Shortcut;
*
* @author Ole Jørgen Brønner (olejorgenb)
*/
-public class ParallelWayAction extends MapMode implements ModifierListener {
+public class ParallelWayAction extends MapMode implements ModifierExListener {
private static final CachingProperty<BasicStroke> HELPER_LINE_STROKE = new StrokeProperty(prefKey("stroke.hepler-line"), "1").cached();
private static final CachingProperty<BasicStroke> REF_LINE_STROKE = new StrokeProperty(prefKey("stroke.ref-line"), "2 2 3").cached();
@@ -172,7 +172,7 @@ public class ParallelWayAction extends MapMode implements ModifierListener {
mv.addTemporaryLayer(temporaryLayer);
//// Needed to update the mouse cursor if modifiers are changed when the mouse is motionless
- Main.map.keyDetector.addModifierListener(this);
+ Main.map.keyDetector.addModifierExListener(this);
sourceWays = new LinkedHashSet<>(getLayerManager().getEditDataSet().getSelectedWays());
for (Way w : sourceWays) {
w.setHighlighted(true);
@@ -187,7 +187,7 @@ public class ParallelWayAction extends MapMode implements ModifierListener {
mv.removeTemporaryLayer(temporaryLayer);
Main.map.statusLine.setDist(-1);
Main.map.statusLine.repaint();
- Main.map.keyDetector.removeModifierListener(this);
+ Main.map.keyDetector.removeModifierExListener(this);
removeWayHighlighting(sourceWays);
pWays = null;
sourceWays = null;
@@ -215,7 +215,7 @@ public class ParallelWayAction extends MapMode implements ModifierListener {
}
@Override
- public void modifiersChanged(int modifiers) {
+ public void modifiersExChanged(int modifiers) {
if (Main.map == null || mv == null || !mv.isActiveLayerDrawable())
return;
@@ -228,7 +228,7 @@ public class ParallelWayAction extends MapMode implements ModifierListener {
private boolean updateModifiersState(int modifiers) {
boolean oldAlt = alt, oldShift = shift, oldCtrl = ctrl;
- updateKeyModifiers(modifiers);
+ updateKeyModifiersEx(modifiers);
return oldAlt != alt || oldShift != shift || oldCtrl != ctrl;
}
@@ -274,7 +274,7 @@ public class ParallelWayAction extends MapMode implements ModifierListener {
@Override
public void mousePressed(MouseEvent e) {
requestFocusInMapView();
- updateModifiersState(e.getModifiers());
+ updateModifiersState(e.getModifiersEx());
// Other buttons are off limit, but we still get events.
if (e.getButton() != MouseEvent.BUTTON1)
return;
@@ -299,7 +299,7 @@ public class ParallelWayAction extends MapMode implements ModifierListener {
@Override
public void mouseReleased(MouseEvent e) {
- updateModifiersState(e.getModifiers());
+ updateModifiersState(e.getModifiersEx());
// Other buttons are off limit, but we still get events.
if (e.getButton() != MouseEvent.BUTTON1)
return;
@@ -354,7 +354,7 @@ public class ParallelWayAction extends MapMode implements ModifierListener {
if (!mouseIsDown)
return;
- boolean modifiersChanged = updateModifiersState(e.getModifiers());
+ boolean modifiersChanged = updateModifiersState(e.getModifiersEx());
updateFlagsChangeableAlways();
if (modifiersChanged) {
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java b/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java
index 7d3de9d..5f57141 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java
@@ -11,12 +11,12 @@ import java.util.Map;
import java.util.Set;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.CombineWayAction;
import org.openstreetmap.josm.command.AddCommand;
import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.command.SequenceCommand;
import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.NodeGraph;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.tools.Geometry;
@@ -69,7 +69,7 @@ public class ParallelWays {
}
// Find a linear ordering of the nodes. Fail if there isn't one.
- CombineWayAction.NodeGraph nodeGraph = CombineWayAction.NodeGraph.createUndirectedGraphFromNodeWays(ways);
+ NodeGraph nodeGraph = NodeGraph.createUndirectedGraphFromNodeWays(ways);
List<Node> sortedNodesPath = nodeGraph.buildSpanningPath();
if (sortedNodesPath == null)
throw new IllegalArgumentException("Ways must have spanning path"); // Create a dedicated exception?
diff --git a/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java b/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
index 8d3e3f0..d489ef7 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
@@ -48,7 +48,7 @@ import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.util.KeyPressReleaseListener;
-import org.openstreetmap.josm.gui.util.ModifierListener;
+import org.openstreetmap.josm.gui.util.ModifierExListener;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Pair;
import org.openstreetmap.josm.tools.Shortcut;
@@ -65,7 +65,7 @@ import org.openstreetmap.josm.tools.Utils;
* On Mac OS X, Ctrl + mouse button 1 simulates right click (map move), so the
* feature "selection remove" is disabled on this platform.
*/
-public class SelectAction extends MapMode implements ModifierListener, KeyPressReleaseListener, SelectionEnded {
+public class SelectAction extends MapMode implements ModifierExListener, KeyPressReleaseListener, SelectionEnded {
private static final String NORMAL = "normal";
@@ -207,7 +207,7 @@ public class SelectAction extends MapMode implements ModifierListener, KeyPressR
cycleManager.init();
virtualManager.init();
// This is required to update the cursors when ctrl/shift/alt is pressed
- Main.map.keyDetector.addModifierListener(this);
+ Main.map.keyDetector.addModifierExListener(this);
Main.map.keyDetector.addKeyListener(this);
}
@@ -218,13 +218,13 @@ public class SelectAction extends MapMode implements ModifierListener, KeyPressR
mv.removeMouseListener(this);
mv.removeMouseMotionListener(this);
mv.setVirtualNodesEnabled(false);
- Main.map.keyDetector.removeModifierListener(this);
+ Main.map.keyDetector.removeModifierExListener(this);
Main.map.keyDetector.removeKeyListener(this);
removeHighlighting();
}
@Override
- public void modifiersChanged(int modifiers) {
+ public void modifiersExChanged(int modifiers) {
if (!Main.isDisplayingMapView() || oldEvent == null) return;
if (giveUserFeedback(oldEvent, modifiers)) {
mv.repaint();
@@ -238,21 +238,21 @@ public class SelectAction extends MapMode implements ModifierListener, KeyPressR
* @return {@code true} if repaint is required
*/
private boolean giveUserFeedback(MouseEvent e) {
- return giveUserFeedback(e, e.getModifiers());
+ return giveUserFeedback(e, e.getModifiersEx());
}
/**
* handles adding highlights and updating the cursor for the given mouse event.
* Please note that the highlighting for merging while moving is handled via mouseDragged.
* @param e {@code MouseEvent} which should be used as base for the feedback
- * @param modifiers define custom keyboard modifiers if the ones from MouseEvent are outdated or similar
+ * @param modifiers define custom keyboard extended modifiers if the ones from MouseEvent are outdated or similar
* @return {@code true} if repaint is required
*/
private boolean giveUserFeedback(MouseEvent e, int modifiers) {
Collection<OsmPrimitive> c = asColl(
mv.getNearestNodeOrWay(e.getPoint(), mv.isSelectablePredicate, true));
- updateKeyModifiers(modifiers);
+ updateKeyModifiersEx(modifiers);
determineMapMode(!c.isEmpty());
Set<OsmPrimitive> newHighlights = new HashSet<>();
diff --git a/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java b/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java
index 28bb721..a17d549 100644
--- a/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java
+++ b/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java
@@ -147,11 +147,11 @@ public class PushbackTokenizer {
}
}
- private static final List<Character> specialChars = Arrays.asList('"', ':', '(', ')', '|', '^', '=', '?', '<', '>');
- private static final List<Character> specialCharsQuoted = Arrays.asList('"');
+ private static final List<Character> SPECIAL_CHARS = Arrays.asList('"', ':', '(', ')', '|', '^', '=', '?', '<', '>');
+ private static final List<Character> SPECIAL_CHARS_QUOTED = Arrays.asList('"');
private String getString(boolean quoted) {
- List<Character> sChars = quoted ? specialCharsQuoted : specialChars;
+ List<Character> sChars = quoted ? SPECIAL_CHARS_QUOTED : SPECIAL_CHARS;
StringBuilder s = new StringBuilder();
boolean escape = false;
while (c != -1 && (escape || (!sChars.contains((char) c) && (quoted || !Character.isWhitespace(c))))) {
diff --git a/src/org/openstreetmap/josm/actions/search/SearchAction.java b/src/org/openstreetmap/josm/actions/search/SearchAction.java
index ca9f0d1..24055c4 100644
--- a/src/org/openstreetmap/josm/actions/search/SearchAction.java
+++ b/src/org/openstreetmap/josm/actions/search/SearchAction.java
@@ -35,7 +35,9 @@ import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
+import javax.swing.SwingUtilities;
import javax.swing.text.BadLocationException;
+import javax.swing.text.Document;
import javax.swing.text.JTextComponent;
import org.openstreetmap.josm.Main;
@@ -54,6 +56,8 @@ import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSException;
import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
import org.openstreetmap.josm.gui.preferences.ToolbarPreferences.ActionParser;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetSelector;
import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
import org.openstreetmap.josm.tools.GBC;
@@ -231,12 +235,30 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
@Override
public void mouseClicked(MouseEvent e) {
- try {
- JTextComponent tf = hcb.getEditorComponent();
- tf.getDocument().insertString(tf.getCaretPosition(), ' ' + insertText, null);
- } catch (BadLocationException ex) {
- throw new JosmRuntimeException(ex.getMessage(), ex);
+ JTextComponent tf = hcb.getEditorComponent();
+
+ /*
+ * Make sure that the focus is transferred to the search text field
+ * from the selector component.
+ */
+ if (!tf.hasFocus()) {
+ tf.requestFocusInWindow();
}
+
+ /*
+ * In order to make interaction with the search dialog simpler,
+ * we make sure that if autocompletion triggers and the text field is
+ * not in focus, the correct area is selected. We first request focus
+ * and then execute the selection logic. invokeLater allows us to
+ * defer the selection until waiting for focus.
+ */
+ SwingUtilities.invokeLater(() -> {
+ try {
+ tf.getDocument().insertString(tf.getCaretPosition(), ' ' + insertText, null);
+ } catch (BadLocationException ex) {
+ throw new JosmRuntimeException(ex.getMessage(), ex);
+ }
+ });
}
});
}
@@ -244,19 +266,25 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
}
}
+ /**
+ * Builds and shows the search dialog.
+ * @param initialValues A set of initial values needed in order to initialize the search dialog.
+ * If is {@code null}, then default settings are used.
+ * @return Returns {@link SearchAction} object containing parameters of the search.
+ */
public static SearchSetting showSearchDialog(SearchSetting initialValues) {
if (initialValues == null) {
initialValues = new SearchSetting();
}
- // -- prepare the combo box with the search expressions
- //
+
+ // prepare the combo box with the search expressions
JLabel label = new JLabel(initialValues instanceof Filter ? tr("Filter string:") : tr("Search string:"));
- final HistoryComboBox hcbSearchString = new HistoryComboBox();
- final String tooltip = tr("Enter the search expression");
+ HistoryComboBox hcbSearchString = new HistoryComboBox();
+ String tooltip = tr("Enter the search expression");
hcbSearchString.setText(initialValues.text);
hcbSearchString.setToolTipText(tooltip);
+
// we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
- //
List<String> searchExpressionHistory = getSearchExpressionHistory();
Collections.reverse(searchExpressionHistory);
hcbSearchString.setPossibleItems(searchExpressionHistory);
@@ -273,21 +301,19 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
bg.add(remove);
bg.add(inSelection);
- final JCheckBox caseSensitive = new JCheckBox(tr("case sensitive"), initialValues.caseSensitive);
+ JCheckBox caseSensitive = new JCheckBox(tr("case sensitive"), initialValues.caseSensitive);
JCheckBox allElements = new JCheckBox(tr("all objects"), initialValues.allElements);
allElements.setToolTipText(tr("Also include incomplete and deleted objects in search."));
JCheckBox addOnToolbar = new JCheckBox(tr("add toolbar button"), false);
- final JRadioButton standardSearch = new JRadioButton(tr("standard"), !initialValues.regexSearch && !initialValues.mapCSSSearch);
- final JRadioButton regexSearch = new JRadioButton(tr("regular expression"), initialValues.regexSearch);
- final JRadioButton mapCSSSearch = new JRadioButton(tr("MapCSS selector"), initialValues.mapCSSSearch);
- final ButtonGroup bg2 = new ButtonGroup();
+ JRadioButton standardSearch = new JRadioButton(tr("standard"), !initialValues.regexSearch && !initialValues.mapCSSSearch);
+ JRadioButton regexSearch = new JRadioButton(tr("regular expression"), initialValues.regexSearch);
+ JRadioButton mapCSSSearch = new JRadioButton(tr("MapCSS selector"), initialValues.mapCSSSearch);
+ ButtonGroup bg2 = new ButtonGroup();
bg2.add(standardSearch);
bg2.add(regexSearch);
bg2.add(mapCSSSearch);
- JPanel left = new JPanel(new GridBagLayout());
-
JPanel selectionSettings = new JPanel(new GridBagLayout());
selectionSettings.setBorder(BorderFactory.createTitledBorder(tr("Selection settings")));
selectionSettings.add(replace, GBC.eol().anchor(GBC.WEST).fill(GBC.HORIZONTAL));
@@ -299,6 +325,8 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
additionalSettings.setBorder(BorderFactory.createTitledBorder(tr("Additional settings")));
additionalSettings.add(caseSensitive, GBC.eol().anchor(GBC.WEST).fill(GBC.HORIZONTAL));
+ JPanel left = new JPanel(new GridBagLayout());
+
left.add(selectionSettings, GBC.eol().fill(GBC.BOTH));
left.add(additionalSettings, GBC.eol().fill(GBC.BOTH));
@@ -315,13 +343,20 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
left.add(searchOptions, GBC.eol().fill(GBC.BOTH));
}
- final JPanel right = SearchAction.buildHintsSection(hcbSearchString);
- final JPanel top = new JPanel(new GridBagLayout());
+ JPanel right = SearchAction.buildHintsSection(hcbSearchString);
+ JPanel top = new JPanel(new GridBagLayout());
top.add(label, GBC.std().insets(0, 0, 5, 0));
top.add(hcbSearchString, GBC.eol().fill(GBC.HORIZONTAL));
- final JTextComponent editorComponent = hcbSearchString.getEditorComponent();
- editorComponent.getDocument().addDocumentListener(new AbstractTextComponentValidator(editorComponent) {
+ JTextComponent editorComponent = hcbSearchString.getEditorComponent();
+ Document document = editorComponent.getDocument();
+
+ /*
+ * Setup the logic to validate the contents of the search text field which is executed
+ * every time the content of the field has changed. If the query is incorrect, then
+ * the text field is colored red.
+ */
+ document.addDocumentListener(new AbstractTextComponentValidator(editorComponent) {
@Override
public void validate() {
@@ -348,10 +383,20 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
}
});
- final JPanel p = new JPanel(new GridBagLayout());
+ /*
+ * Setup the logic to append preset queries to the search text field according to
+ * selected preset by the user. Every query is of the form ' group/sub-group/.../presetName'
+ * if the corresponding group of the preset exists, otherwise it is simply ' presetName'.
+ */
+ TaggingPresetSelector selector = new TaggingPresetSelector(false, false);
+ selector.setBorder(BorderFactory.createTitledBorder(tr("Search by preset")));
+ selector.setDblClickListener(ev -> setPresetDblClickListener(selector, editorComponent));
+
+ JPanel p = new JPanel(new GridBagLayout());
p.add(top, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 5, 5, 0));
p.add(left, GBC.std().anchor(GBC.NORTH).insets(5, 10, 10, 0).fill(GBC.VERTICAL));
- p.add(right, GBC.eol().fill(GBC.BOTH).insets(0, 10, 0, 0));
+ p.add(right, GBC.std().fill(GBC.BOTH).insets(0, 10, 0, 0));
+ p.add(selector, GBC.eol().fill(GBC.BOTH).insets(0, 10, 0, 0));
ExtendedDialog dialog = new ExtendedDialog(
Main.parent,
@@ -390,16 +435,22 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
if (dialog.showDialog().getValue() != 1) return null;
// User pressed OK - let's perform the search
- SearchMode mode = replace.isSelected() ? SearchAction.SearchMode.replace
- : (add.isSelected() ? SearchAction.SearchMode.add
- : (remove.isSelected() ? SearchAction.SearchMode.remove : SearchAction.SearchMode.in_selection));
initialValues.text = hcbSearchString.getText();
- initialValues.mode = mode;
initialValues.caseSensitive = caseSensitive.isSelected();
initialValues.allElements = allElements.isSelected();
initialValues.regexSearch = regexSearch.isSelected();
initialValues.mapCSSSearch = mapCSSSearch.isSelected();
+ if (inSelection.isSelected()) {
+ initialValues.mode = SearchAction.SearchMode.in_selection;
+ } else if (replace.isSelected()) {
+ initialValues.mode = SearchAction.SearchMode.replace;
+ } else if (add.isSelected()) {
+ initialValues.mode = SearchAction.SearchMode.add;
+ } else {
+ initialValues.mode = SearchAction.SearchMode.remove;
+ }
+
if (addOnToolbar.isSelected()) {
ToolbarPreferences.ActionDefinition aDef =
new ToolbarPreferences.ActionDefinition(Main.main.menu.search);
@@ -413,6 +464,7 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
// add custom search button to toolbar preferences
Main.toolbar.addCustomButton(res, -1, false);
}
+
return initialValues;
}
@@ -458,6 +510,12 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
.addKeyword("untagged", "untagged ", tr("object without useful tags")),
GBC.eol());
hintPanel.add(new SearchKeywordRow(hcbSearchString)
+ .addKeyword("preset:\"Annotation/Address\"", "preset:\"Annotation/Address\"",
+ tr("all objects that use the address preset"))
+ .addKeyword("preset:\"Geography/Nature/*\"", "preset:\"Geography/Nature/*\"",
+ tr("all objects that use any preset under the Geography/Nature group")),
+ GBC.eol().anchor(GBC.CENTER));
+ hintPanel.add(new SearchKeywordRow(hcbSearchString)
.addTitle(tr("metadata"))
.addKeyword("user:", "user:", tr("objects changed by user", "user:anonymous"))
.addKeyword("id:", "id:", tr("objects with given ID"), "id:0 (new objects)")
@@ -575,6 +633,43 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
}
/**
+ *
+ * @param selector Selector component that the user interacts with
+ * @param searchEditor Editor for search queries
+ */
+ private static void setPresetDblClickListener(TaggingPresetSelector selector, JTextComponent searchEditor) {
+ TaggingPreset selectedPreset = selector.getSelectedPresetAndUpdateClassification();
+
+ if (selectedPreset == null) {
+ return;
+ }
+
+ /*
+ * Make sure that the focus is transferred to the search text field
+ * from the selector component.
+ */
+ searchEditor.requestFocusInWindow();
+
+ /*
+ * In order to make interaction with the search dialog simpler,
+ * we make sure that if autocompletion triggers and the text field is
+ * not in focus, the correct area is selected. We first request focus
+ * and then execute the selection logic. invokeLater allows us to
+ * defer the selection until waiting for focus.
+ */
+ SwingUtilities.invokeLater(() -> {
+ int textOffset = searchEditor.getCaretPosition();
+ String presetSearchQuery = " preset:" +
+ "\"" + selectedPreset.getRawName() + "\"";
+ try {
+ searchEditor.getDocument().insertString(textOffset, presetSearchQuery, null);
+ } catch (BadLocationException e1) {
+ throw new JosmRuntimeException(e1.getMessage(), e1);
+ }
+ });
+ }
+
+ /**
* Interfaces implementing this may receive the result of the current search.
* @author Michael Zangl
* @since 10457
@@ -749,6 +844,10 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
}
}
+ /**
+ * This class defines a set of parameters that is used to
+ * perform search within the search dialog.
+ */
public static class SearchSetting {
public String text;
public SearchMode mode;
@@ -810,6 +909,24 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
return Objects.hash(text, mode, caseSensitive, regexSearch, mapCSSSearch, allElements);
}
+ /**
+ * <p>Transforms a string following a certain format, namely "[R | A | D | S][C?,R?,A?,M?] [a-zA-Z]"
+ * where the first part defines the mode of the search, see {@link SearchMode}, the second defines
+ * a set of attributes within the {@code SearchSetting} class and the second is the search query.
+ * <p>
+ * Attributes are as follows:
+ * <ul>
+ * <li>C - if search is case sensitive
+ * <li>R - if the regex syntax is used
+ * <li>A - if all objects are considered
+ * <li>M - if the mapCSS syntax is used
+ * </ul>
+ * <p>For example, "RC type:node" is a valid string representation of an object that replaces the
+ * current selection, is case sensitive and searches for all objects of type node.
+ * @param s A string representation of a {@code SearchSetting} object
+ * from which the object must be built.
+ * @return A {@code SearchSetting} defined by the input string.
+ */
public static SearchSetting readFromString(String s) {
if (s.isEmpty())
return null;
@@ -851,6 +968,11 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
return result;
}
+ /**
+ * Builds a string representation of the {@code SearchSetting} object,
+ * see {@link #readFromString(String)} for more details.
+ * @return A string representation of the {@code SearchSetting} object.
+ */
public String writeToString() {
if (text == null || text.isEmpty())
return "";
diff --git a/src/org/openstreetmap/josm/actions/search/SearchCompiler.java b/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
index b3913c9..861118c 100644
--- a/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
+++ b/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
@@ -20,6 +20,7 @@ import java.util.function.Predicate;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
+import java.util.stream.Collectors;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.search.PushbackTokenizer.Range;
@@ -38,6 +39,10 @@ import org.openstreetmap.josm.gui.mappaint.Environment;
import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser;
import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetMenu;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetSeparator;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
import org.openstreetmap.josm.tools.AlphanumComparator;
import org.openstreetmap.josm.tools.Geometry;
import org.openstreetmap.josm.tools.UncheckedParseException;
@@ -115,7 +120,7 @@ public class SearchCompiler {
private final Collection<String> keywords = Arrays.asList("id", "version", "type", "user", "role",
"changeset", "nodes", "ways", "tags", "areasize", "waylength", "modified", "deleted", "selected",
"incomplete", "untagged", "closed", "new", "indownloadedarea",
- "allindownloadedarea", "inview", "allinview", "timestamp", "nth", "nth%", "hasRole");
+ "allindownloadedarea", "inview", "allinview", "timestamp", "nth", "nth%", "hasRole", "preset");
@Override
public Match get(String keyword, PushbackTokenizer tokenizer) throws ParseError {
@@ -151,6 +156,8 @@ public class SearchCompiler {
return new Version(tokenizer);
case "type":
return new ExactType(tokenizer.readTextOrNumber());
+ case "preset":
+ return new Preset(tokenizer.readTextOrNumber());
case "user":
return new UserMatch(tokenizer.readTextOrNumber());
case "role":
@@ -1554,6 +1561,66 @@ public class SearchCompiler {
}
}
+ /**
+ * Matches presets.
+ * @since 12464
+ */
+ private static class Preset extends Match {
+ private final List<TaggingPreset> presets;
+
+ Preset(String presetName) throws ParseError {
+
+ if (presetName == null || presetName.isEmpty()) {
+ throw new ParseError("The name of the preset is required");
+ }
+
+ int wildCardIdx = presetName.lastIndexOf('*');
+ int length = presetName.length() - 1;
+
+ /*
+ * Match strictly (simply comparing the names) if there is no '*' symbol
+ * at the end of the name or '*' is a part of the preset name.
+ */
+ boolean matchStrictly = wildCardIdx == -1 || wildCardIdx != length;
+
+ this.presets = TaggingPresets.getTaggingPresets()
+ .stream()
+ .filter(preset -> !(preset instanceof TaggingPresetMenu || preset instanceof TaggingPresetSeparator))
+ .filter(preset -> presetNameMatch(presetName, preset, matchStrictly))
+ .collect(Collectors.toList());
+
+ if (this.presets.isEmpty()) {
+ throw new ParseError(tr("Unknown preset name: ") + presetName);
+ }
+ }
+
+ @Override
+ public boolean match(OsmPrimitive osm) {
+ for (TaggingPreset preset : this.presets) {
+ if (preset.test(osm)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ private static boolean presetNameMatch(String name, TaggingPreset preset, boolean matchStrictly) {
+ if (matchStrictly) {
+ return name.equalsIgnoreCase(preset.getRawName());
+ }
+
+ try {
+ String groupSuffix = name.substring(0, name.length() - 2); // try to remove '/*'
+ TaggingPresetMenu group = preset.group;
+
+ return group != null && groupSuffix.equalsIgnoreCase(group.getRawName());
+ } catch (StringIndexOutOfBoundsException ex) {
+ return false;
+ }
+ }
+ }
+
public static class ParseError extends Exception {
public ParseError(String msg) {
super(msg);
@@ -1804,3 +1871,4 @@ public class SearchCompiler {
}
}
}
+
diff --git a/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java b/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java
index 9b56384..e6a20fe 100644
--- a/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java
+++ b/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java
@@ -35,7 +35,7 @@ public final class ReverseWayNoTagCorrector {
/**
* Tags that imply a semantic meaning from the way direction and cannot be changed.
*/
- private static final TagCollection directionalTags = new TagCollection(Arrays.asList(
+ private static final TagCollection DIRECTIONAL_TAGS = new TagCollection(Arrays.asList(
new Tag("natural", "coastline"),
new Tag("natural", "cliff"),
new Tag("barrier", "guard_rail"),
@@ -53,7 +53,7 @@ public final class ReverseWayNoTagCorrector {
final TagCollection collection = new TagCollection();
for (Map.Entry<String, String> entry : way.getKeys().entrySet()) {
final Tag tag = new Tag(entry.getKey(), entry.getValue());
- final boolean isDirectional = directionalTags.contains(tag) || tag.isDirectionKey();
+ final boolean isDirectional = DIRECTIONAL_TAGS.contains(tag) || tag.isDirectionKey();
if (isDirectional) {
final boolean cannotBeCorrected = ReverseWayTagCorrector.getTagCorrections(tag).isEmpty();
if (cannotBeCorrected) {
diff --git a/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java b/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
index a9dea94..8c06136 100644
--- a/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
+++ b/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
@@ -52,16 +52,16 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
}
}
- private static final Collection<Pattern> ignoredKeys = new ArrayList<>();
+ private static final Collection<Pattern> IGNORED_KEYS = new ArrayList<>();
static {
for (String s : OsmPrimitive.getUninterestingKeys()) {
- ignoredKeys.add(getPatternFor(s));
+ IGNORED_KEYS.add(getPatternFor(s));
}
for (String s : new String[]{"name", "ref", "tiger:county"}) {
- ignoredKeys.add(getPatternFor(s, false));
+ IGNORED_KEYS.add(getPatternFor(s, false));
}
for (String s : new String[]{"tiger:county", "turn:lanes", "change:lanes", "placement"}) {
- ignoredKeys.add(getPatternFor(s, true));
+ IGNORED_KEYS.add(getPatternFor(s, true));
}
}
@@ -291,7 +291,7 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
}
private static boolean ignoreKeyForCorrection(String key) {
- for (Pattern ignoredKey : ignoredKeys) {
+ for (Pattern ignoredKey : IGNORED_KEYS) {
if (ignoredKey.matcher(key).matches()) {
return true;
}
diff --git a/src/org/openstreetmap/josm/data/Preferences.java b/src/org/openstreetmap/josm/data/Preferences.java
index c58a841..440f15d 100644
--- a/src/org/openstreetmap/josm/data/Preferences.java
+++ b/src/org/openstreetmap/josm/data/Preferences.java
@@ -1456,11 +1456,11 @@ public class Preferences {
} catch (ReflectiveOperationException ex) {
throw new IllegalArgumentException(ex);
}
- for (Entry<String, String> key_value : hash.entrySet()) {
+ for (Entry<String, String> keyValue : hash.entrySet()) {
Object value;
Field f;
try {
- f = klass.getDeclaredField(key_value.getKey().replace('-', '_'));
+ f = klass.getDeclaredField(keyValue.getKey().replace('-', '_'));
} catch (NoSuchFieldException ex) {
Main.trace(ex);
continue;
@@ -1470,25 +1470,25 @@ public class Preferences {
}
Utils.setObjectsAccessible(f);
if (f.getType() == Boolean.class || f.getType() == boolean.class) {
- value = Boolean.valueOf(key_value.getValue());
+ value = Boolean.valueOf(keyValue.getValue());
} else if (f.getType() == Integer.class || f.getType() == int.class) {
try {
- value = Integer.valueOf(key_value.getValue());
+ value = Integer.valueOf(keyValue.getValue());
} catch (NumberFormatException nfe) {
continue;
}
} else if (f.getType() == Double.class || f.getType() == double.class) {
try {
- value = Double.valueOf(key_value.getValue());
+ value = Double.valueOf(keyValue.getValue());
} catch (NumberFormatException nfe) {
continue;
}
} else if (f.getType() == String.class) {
- value = key_value.getValue();
+ value = keyValue.getValue();
} else if (f.getType().isAssignableFrom(Map.class)) {
- value = mapFromJson(key_value.getValue());
+ value = mapFromJson(keyValue.getValue());
} else if (f.getType().isAssignableFrom(MultiMap.class)) {
- value = multiMapFromJson(key_value.getValue());
+ value = multiMapFromJson(keyValue.getValue());
} else
throw new JosmRuntimeException("unsupported preference primitive type");
diff --git a/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java b/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java
index 401138f..72f5461 100644
--- a/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java
+++ b/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java
@@ -5,6 +5,8 @@ import java.io.IOException;
import java.net.URL;
/**
+ * Interface for a job to load a single object (typically an imagery tile).
+ * It is either retrieved from cache or downloaded from the given URL ({@link #getUrl()}).
*
* @author Wiktor Niesiobędzki
*
diff --git a/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java b/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
index c9f1592..f8051fc 100644
--- a/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
+++ b/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
@@ -47,7 +47,7 @@ public final class JCSCacheManager {
private static final String PREFERENCE_PREFIX = "jcs.cache";
public static final BooleanProperty USE_BLOCK_CACHE = new BooleanProperty(PREFERENCE_PREFIX + ".use_block_cache", true);
- private static final AuxiliaryCacheFactory diskCacheFactory =
+ private static final AuxiliaryCacheFactory DISK_CACHE_FACTORY =
USE_BLOCK_CACHE.get() ? new BlockDiskCacheFactory() : new IndexedDiskCacheFactory();
private static FileLock cacheDirLock;
@@ -176,8 +176,8 @@ public final class JCSCacheManager {
IDiskCacheAttributes diskAttributes = getDiskCacheAttributes(maxDiskObjects, cachePath, cacheName);
try {
if (cc.getAuxCaches().length == 0) {
- AuxiliaryCache<K, V> diskCache = diskCacheFactory.createCache(diskAttributes, cacheManager, null, new StandardSerializer());
- cc.setAuxCaches(new AuxiliaryCache[]{diskCache});
+ cc.setAuxCaches(new AuxiliaryCache[]{DISK_CACHE_FACTORY.createCache(
+ diskAttributes, cacheManager, null, new StandardSerializer())});
}
} catch (IOException e) {
throw e;
diff --git a/src/org/openstreetmap/josm/data/conflict/IConflictListener.java b/src/org/openstreetmap/josm/data/conflict/IConflictListener.java
index d1466e5..ff8019f 100644
--- a/src/org/openstreetmap/josm/data/conflict/IConflictListener.java
+++ b/src/org/openstreetmap/josm/data/conflict/IConflictListener.java
@@ -1,8 +1,20 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.conflict;
+/**
+ * Interface for listeners that get notified when conflicts are added to or
+ * removed from a {@link ConflictCollection}.
+ */
public interface IConflictListener {
+ /**
+ * Called when conflicts are added.
+ * @param conflicts collection to which conflicts have been added
+ */
void onConflictsAdded(ConflictCollection conflicts);
+ /**
+ * Called when conflicts are removed.
+ * @param conflicts collection from which conflicts have been removed
+ */
void onConflictsRemoved(ConflictCollection conflicts);
}
diff --git a/src/org/openstreetmap/josm/data/coor/LatLon.java b/src/org/openstreetmap/josm/data/coor/LatLon.java
index e09c4b2..24cdc7e 100644
--- a/src/org/openstreetmap/josm/data/coor/LatLon.java
+++ b/src/org/openstreetmap/josm/data/coor/LatLon.java
@@ -233,8 +233,9 @@ public class LatLon extends Coordinate implements ILatLon {
* Replies the coordinate in degrees/minutes format
* @param pCoordinate The coordinate to convert
* @return The coordinate in degrees/minutes format
+ * @since 12537
*/
- public static String dm(double pCoordinate) {
+ public static String degreesMinutes(double pCoordinate) {
double tAbsCoord = Math.abs(pCoordinate);
int tDegree = (int) tAbsCoord;
@@ -252,6 +253,17 @@ public class LatLon extends Coordinate implements ILatLon {
}
/**
+ * Replies the coordinate in degrees/minutes format
+ * @param pCoordinate The coordinate to convert
+ * @return The coordinate in degrees/minutes format
+ * @deprecated use {@link #degreesMinutes(double)} instead
+ */
+ @Deprecated
+ public static String dm(double pCoordinate) {
+ return degreesMinutes(pCoordinate);
+ }
+
+ /**
* Constructs a new object representing the given latitude/longitude.
* @param lat the latitude, i.e., the north-south position in degrees
* @param lon the longitude, i.e., the east-west position in degrees
@@ -290,7 +302,7 @@ public class LatLon extends Coordinate implements ILatLon {
switch(d) {
case DECIMAL_DEGREES: return cDdFormatter.format(y);
case DEGREES_MINUTES_SECONDS: return dms(y) + ((y < 0) ? SOUTH : NORTH);
- case NAUTICAL: return dm(y) + ((y < 0) ? SOUTH : NORTH);
+ case NAUTICAL: return degreesMinutes(y) + ((y < 0) ? SOUTH : NORTH);
case EAST_NORTH: return cDdFormatter.format(this.getEastNorth().north());
default: return "ERR";
}
@@ -310,7 +322,7 @@ public class LatLon extends Coordinate implements ILatLon {
switch(d) {
case DECIMAL_DEGREES: return cDdFormatter.format(x);
case DEGREES_MINUTES_SECONDS: return dms(x) + ((x < 0) ? WEST : EAST);
- case NAUTICAL: return dm(x) + ((x < 0) ? WEST : EAST);
+ case NAUTICAL: return degreesMinutes(x) + ((x < 0) ? WEST : EAST);
case EAST_NORTH: return cDdFormatter.format(this.getEastNorth().east());
default: return "ERR";
}
diff --git a/src/org/openstreetmap/josm/data/imagery/Shape.java b/src/org/openstreetmap/josm/data/imagery/Shape.java
index db4b9e4..dc38d75 100644
--- a/src/org/openstreetmap/josm/data/imagery/Shape.java
+++ b/src/org/openstreetmap/josm/data/imagery/Shape.java
@@ -15,8 +15,10 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.Geometry;
/**
- * @author Vincent
+ * Data class to store the outline for background imagery coverage.
*
+ * Configuration data for imagery to describe the coverage area ({@link ImageryInfo.ImageryBounds}).
+ * @author Vincent
*/
public class Shape {
diff --git a/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java b/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java
index a97eaad..6bf73f8 100644
--- a/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java
+++ b/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java
@@ -46,8 +46,7 @@ public class TMSCachedTileLoader implements TileLoader, CachedTileLoader {
* separate from JCS thread pool for TMS loader, so we can have different thread pools for default JCS
* and for TMS imagery
*/
- private static ThreadPoolExecutor DEFAULT_DOWNLOAD_JOB_DISPATCHER = getNewThreadPoolExecutor("TMS-downloader-%d");
-
+ private static final ThreadPoolExecutor DEFAULT_DOWNLOAD_JOB_DISPATCHER = getNewThreadPoolExecutor("TMS-downloader-%d");
private ThreadPoolExecutor downloadExecutor = DEFAULT_DOWNLOAD_JOB_DISPATCHER;
diff --git a/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java b/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java
index c3e43a7..dcdb65c 100644
--- a/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java
+++ b/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java
@@ -44,7 +44,7 @@ public class TemplatedWMSTileSource extends AbstractWMSTileSource implements Tem
private static final Pattern PATTERN_PARAM = Pattern.compile("\\{([^}]+)\\}");
// CHECKSTYLE.ON: SingleSpaceSeparator
- private static final NumberFormat latLonFormat = new DecimalFormat("###0.0000000", new DecimalFormatSymbols(Locale.US));
+ private static final NumberFormat LATLON_FORMAT = new DecimalFormat("###0.0000000", new DecimalFormatSymbols(Locale.US));
private static final Pattern[] ALL_PATTERNS = {
PATTERN_HEADER, PATTERN_PROJ, PATTERN_WKID, PATTERN_BBOX, PATTERN_W, PATTERN_S, PATTERN_E, PATTERN_N, PATTERN_WIDTH, PATTERN_HEIGHT
@@ -110,9 +110,11 @@ public class TemplatedWMSTileSource extends AbstractWMSTileSource implements Tem
}
String bbox;
if (switchLatLon) {
- bbox = String.format("%s,%s,%s,%s", latLonFormat.format(s), latLonFormat.format(w), latLonFormat.format(n), latLonFormat.format(e));
+ bbox = String.format("%s,%s,%s,%s",
+ LATLON_FORMAT.format(s), LATLON_FORMAT.format(w), LATLON_FORMAT.format(n), LATLON_FORMAT.format(e));
} else {
- bbox = String.format("%s,%s,%s,%s", latLonFormat.format(w), latLonFormat.format(s), latLonFormat.format(e), latLonFormat.format(n));
+ bbox = String.format("%s,%s,%s,%s",
+ LATLON_FORMAT.format(w), LATLON_FORMAT.format(s), LATLON_FORMAT.format(e), LATLON_FORMAT.format(n));
}
// Using StringBuffer and generic PATTERN_PARAM matcher gives 2x performance improvement over replaceAll
@@ -131,16 +133,16 @@ public class TemplatedWMSTileSource extends AbstractWMSTileSource implements Tem
replacement = bbox;
break;
case "w":
- replacement = latLonFormat.format(w);
+ replacement = LATLON_FORMAT.format(w);
break;
case "s":
- replacement = latLonFormat.format(s);
+ replacement = LATLON_FORMAT.format(s);
break;
case "e":
- replacement = latLonFormat.format(e);
+ replacement = LATLON_FORMAT.format(e);
break;
case "n":
- replacement = latLonFormat.format(n);
+ replacement = LATLON_FORMAT.format(n);
break;
case "width":
case "height":
diff --git a/src/org/openstreetmap/josm/data/notes/Note.java b/src/org/openstreetmap/josm/data/notes/Note.java
index 2f569fb..960e03e 100644
--- a/src/org/openstreetmap/josm/data/notes/Note.java
+++ b/src/org/openstreetmap/josm/data/notes/Note.java
@@ -78,7 +78,10 @@ public class Note {
this.latLon = latLon;
}
- /** @return The unique OSM ID of this note */
+ /**
+ * Returns the unique OSM ID of this note.
+ * @return The unique OSM ID of this note
+ */
public long getId() {
return id;
}
@@ -91,12 +94,18 @@ public class Note {
this.id = id;
}
- /** @return The geographic location of the note */
+ /**
+ * Returns the geographic location of the note.
+ * @return The geographic location of the note
+ */
public LatLon getLatLon() {
return latLon;
}
- /** @return Date that this note was submitted */
+ /**
+ * Returns the date at which this note was submitted.
+ * @return Date that this note was submitted
+ */
public Date getCreatedAt() {
return DateUtils.cloneDate(createdAt);
}
@@ -109,7 +118,10 @@ public class Note {
this.createdAt = DateUtils.cloneDate(createdAt);
}
- /** @return Date that this note was closed. Null if it is still open. */
+ /**
+ * Returns the date at which this note was closed.
+ * @return Date that this note was closed. Null if it is still open.
+ */
public Date getClosedAt() {
return DateUtils.cloneDate(closedAt);
}
@@ -122,7 +134,10 @@ public class Note {
this.closedAt = DateUtils.cloneDate(closedAt);
}
- /** @return The open or closed state of this note */
+ /**
+ * Returns the open or closed state of this note.
+ * @return The open or closed state of this note
+ */
public State getState() {
return state;
}
@@ -135,7 +150,10 @@ public class Note {
this.state = state;
}
- /** @return An ordered list of comments associated with this note */
+ /**
+ * Returns the list of comments associated with this note.
+ * @return An ordered list of comments associated with this note
+ */
public List<NoteComment> getComments() {
return comments;
}
diff --git a/src/org/openstreetmap/josm/data/notes/NoteComment.java b/src/org/openstreetmap/josm/data/notes/NoteComment.java
index f08017b..7a59ef9 100644
--- a/src/org/openstreetmap/josm/data/notes/NoteComment.java
+++ b/src/org/openstreetmap/josm/data/notes/NoteComment.java
@@ -57,22 +57,34 @@ public class NoteComment {
this.isNew = isNew;
}
- /** @return Plain text of user's comment */
+ /**
+ * Returns Plain text of user's comment.
+ * @return Plain text of user's comment
+ */
public String getText() {
return text;
}
- /** @return JOSM's User object for the user who made this comment */
+ /**
+ * Returns the user who made this comment.
+ * @return JOSM's User object for the user who made this comment
+ */
public User getUser() {
return user;
}
- /** @return The time at which this comment was created */
+ /**
+ * Returns the time at which this comment was created.
+ * @return The time at which this comment was created
+ */
public Date getCommentTimestamp() {
return DateUtils.cloneDate(commentTimestamp);
}
- /** @return the action associated with this note */
+ /**
+ * Returns the action associated with this note.
+ * @return the action associated with this note
+ */
public Action getNoteAction() {
return action;
}
@@ -85,7 +97,10 @@ public class NoteComment {
this.isNew = isNew;
}
- /** @return true if this is a new comment/action and needs to be uploaded to the API */
+ /**
+ * Determines if this is a new comment/action and needs to be uploaded to the API
+ * @return true if this is a new comment/action and needs to be uploaded to the API
+ */
public boolean isNew() {
return isNew;
}
diff --git a/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java b/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
index 79453c8..44bb694 100644
--- a/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
+++ b/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
@@ -48,11 +48,37 @@ public abstract class AbstractPrimitive implements IPrimitive {
private static final AtomicLong idCounter = new AtomicLong(0);
+ /**
+ * Generates a new primitive unique id.
+ * @return new primitive unique (negative) id
+ */
static long generateUniqueId() {
return idCounter.decrementAndGet();
}
/**
+ * Returns the current primitive unique id.
+ * @return the current primitive unique (negative) id (last generated)
+ * @since 12536
+ */
+ public static long currentUniqueId() {
+ return idCounter.get();
+ }
+
+ /**
+ * Advances the current primitive unique id to skip a range of values.
+ * @param newId new unique id
+ * @throws IllegalArgumentException if newId is greater than current unique id
+ * @since 12536
+ */
+ public static void advanceUniqueId(long newId) {
+ if (newId > currentUniqueId()) {
+ throw new IllegalArgumentException("Cannot modify the id counter backwards");
+ }
+ idCounter.set(newId);
+ }
+
+ /**
* This flag shows, that the properties have been changed by the user
* and on upload the object will be send to the server.
*/
diff --git a/src/org/openstreetmap/josm/data/osm/Changeset.java b/src/org/openstreetmap/josm/data/osm/Changeset.java
index 7df9efa..8f16ebf 100644
--- a/src/org/openstreetmap/josm/data/osm/Changeset.java
+++ b/src/org/openstreetmap/josm/data/osm/Changeset.java
@@ -9,6 +9,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Optional;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.LatLon;
@@ -21,7 +22,7 @@ import org.openstreetmap.josm.tools.date.DateUtils;
* upload but in the future we may do more.
* @since 625
*/
-public final class Changeset implements Tagged {
+public final class Changeset implements Tagged, Comparable<Changeset> {
/** The maximum changeset tag length allowed by API 0.6 **/
public static final int MAX_CHANGESET_TAG_LENGTH = 255;
@@ -118,6 +119,7 @@ public final class Changeset implements Tagged {
* a value less than {@code 0} if {@code getId() < other.getId()}; and
* a value greater than {@code 0} if {@code getId() > other.getId()}
*/
+ @Override
public int compareTo(Changeset other) {
return Integer.compare(getId(), other.getId());
}
@@ -263,8 +265,17 @@ public final class Changeset implements Tagged {
}
/**
- * Replies the number of comments for this changeset.
- * @return the number of comments for this changeset
+ * Replies this changeset comment.
+ * @return this changeset comment (empty string if missing)
+ * @since 12494
+ */
+ public String getComment() {
+ return Optional.ofNullable(get("comment")).orElse("");
+ }
+
+ /**
+ * Replies the number of comments for this changeset discussion.
+ * @return the number of comments for this changeset discussion
* @since 7700
*/
public int getCommentsCount() {
@@ -272,8 +283,8 @@ public final class Changeset implements Tagged {
}
/**
- * Sets the number of comments for this changeset.
- * @param commentsCount the number of comments for this changeset
+ * Sets the number of comments for this changeset discussion.
+ * @param commentsCount the number of comments for this changeset discussion
* @since 7700
*/
public void setCommentsCount(int commentsCount) {
diff --git a/src/org/openstreetmap/josm/data/osm/ChangesetCache.java b/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
index cb7d7ce..f08bb7b 100644
--- a/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
+++ b/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
@@ -36,7 +36,7 @@ import org.openstreetmap.josm.tools.SubclassFilteredCollection;
*/
public final class ChangesetCache implements PreferenceChangedListener {
/** the unique instance */
- private static final ChangesetCache instance = new ChangesetCache();
+ private static final ChangesetCache INSTANCE = new ChangesetCache();
/** the cached changesets */
private final Map<Integer, Changeset> cache = new HashMap<>();
@@ -55,7 +55,7 @@ public final class ChangesetCache implements PreferenceChangedListener {
* @return the unique instance of the cache
*/
public static ChangesetCache getInstance() {
- return instance;
+ return INSTANCE;
}
/**
diff --git a/src/org/openstreetmap/josm/data/osm/DataSet.java b/src/org/openstreetmap/josm/data/osm/DataSet.java
index 0abf16a..bea7e72 100644
--- a/src/org/openstreetmap/josm/data/osm/DataSet.java
+++ b/src/org/openstreetmap/josm/data/osm/DataSet.java
@@ -233,7 +233,7 @@ public final class DataSet extends QuadBucketPrimitiveStore implements Data, Pro
// and then get the cloned members
Collection<Relation> relations = copyFrom.getRelations();
for (Relation r : relations) {
- Relation newRelation = new Relation(r, r.isNew());
+ Relation newRelation = new Relation(r);
newRelation.setMembers(null);
primMap.put(r, newRelation);
addPrimitive(newRelation);
@@ -250,6 +250,7 @@ public final class DataSet extends QuadBucketPrimitiveStore implements Data, Pro
dataSources.add(new DataSource(source));
}
version = copyFrom.version;
+ uploadPolicy = copyFrom.uploadPolicy;
} finally {
copyFrom.getReadLock().unlock();
}
diff --git a/src/org/openstreetmap/josm/data/osm/NodeGraph.java b/src/org/openstreetmap/josm/data/osm/NodeGraph.java
new file mode 100644
index 0000000..3734517
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/osm/NodeGraph.java
@@ -0,0 +1,307 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.Stack;
+
+import org.openstreetmap.josm.tools.Pair;
+
+/**
+ * A directed or undirected graph of nodes.
+ * @since 12463 (extracted from CombineWayAction)
+ */
+public class NodeGraph {
+
+ /**
+ * Builds a list of pair of nodes from the given way.
+ * @param way way
+ * @param directed if {@code true} each pair of nodes will occur once, in the way nodes order.
+ * if {@code false} each pair of nodes will occur twice (the pair and its inversed copy)
+ * @return a list of pair of nodes from the given way
+ */
+ public static List<NodePair> buildNodePairs(Way way, boolean directed) {
+ List<NodePair> pairs = new ArrayList<>();
+ for (Pair<Node, Node> pair: way.getNodePairs(false /* don't sort */)) {
+ pairs.add(new NodePair(pair));
+ if (!directed) {
+ pairs.add(new NodePair(pair).swap());
+ }
+ }
+ return pairs;
+ }
+
+ /**
+ * Builds a list of pair of nodes from the given ways.
+ * @param ways ways
+ * @param directed if {@code true} each pair of nodes will occur once, in the way nodes order.
+ * if {@code false} each pair of nodes will occur twice (the pair and its inversed copy)
+ * @return a list of pair of nodes from the given ways
+ */
+ public static List<NodePair> buildNodePairs(List<Way> ways, boolean directed) {
+ List<NodePair> pairs = new ArrayList<>();
+ for (Way w: ways) {
+ pairs.addAll(buildNodePairs(w, directed));
+ }
+ return pairs;
+ }
+
+ /**
+ * Builds a new list of pair nodes without the duplicated pairs (including inversed copies).
+ * @param pairs existing list of pairs
+ * @return a new list of pair nodes without the duplicated pairs
+ */
+ public static List<NodePair> eliminateDuplicateNodePairs(List<NodePair> pairs) {
+ List<NodePair> cleaned = new ArrayList<>();
+ for (NodePair p: pairs) {
+ if (!cleaned.contains(p) && !cleaned.contains(p.swap())) {
+ cleaned.add(p);
+ }
+ }
+ return cleaned;
+ }
+
+ public static NodeGraph createDirectedGraphFromNodePairs(List<NodePair> pairs) {
+ NodeGraph graph = new NodeGraph();
+ for (NodePair pair: pairs) {
+ graph.add(pair);
+ }
+ return graph;
+ }
+
+ public static NodeGraph createDirectedGraphFromWays(Collection<Way> ways) {
+ NodeGraph graph = new NodeGraph();
+ for (Way w: ways) {
+ graph.add(buildNodePairs(w, true /* directed */));
+ }
+ return graph;
+ }
+
+ /**
+ * Create an undirected graph from the given node pairs.
+ * @param pairs Node pairs to build the graph from
+ * @return node graph structure
+ */
+ public static NodeGraph createUndirectedGraphFromNodeList(List<NodePair> pairs) {
+ NodeGraph graph = new NodeGraph();
+ for (NodePair pair: pairs) {
+ graph.add(pair);
+ graph.add(pair.swap());
+ }
+ return graph;
+ }
+
+ /**
+ * Create an undirected graph from the given ways, but prevent reversing of all
+ * non-new ways by fix one direction.
+ * @param ways Ways to build the graph from
+ * @return node graph structure
+ * @since 8181
+ */
+ public static NodeGraph createUndirectedGraphFromNodeWays(Collection<Way> ways) {
+ NodeGraph graph = new NodeGraph();
+ for (Way w: ways) {
+ graph.add(buildNodePairs(w, false /* undirected */));
+ }
+ return graph;
+ }
+
+ public static NodeGraph createNearlyUndirectedGraphFromNodeWays(Collection<Way> ways) {
+ boolean dir = true;
+ NodeGraph graph = new NodeGraph();
+ for (Way w: ways) {
+ if (!w.isNew()) {
+ /* let the first non-new way give the direction (see #5880) */
+ graph.add(buildNodePairs(w, dir));
+ dir = false;
+ } else {
+ graph.add(buildNodePairs(w, false /* undirected */));
+ }
+ }
+ return graph;
+ }
+
+ private final Set<NodePair> edges;
+ private int numUndirectedEges;
+ private final Map<Node, List<NodePair>> successors = new LinkedHashMap<>();
+ private final Map<Node, List<NodePair>> predecessors = new LinkedHashMap<>();
+
+ protected void rememberSuccessor(NodePair pair) {
+ if (successors.containsKey(pair.getA())) {
+ if (!successors.get(pair.getA()).contains(pair)) {
+ successors.get(pair.getA()).add(pair);
+ }
+ } else {
+ List<NodePair> l = new ArrayList<>();
+ l.add(pair);
+ successors.put(pair.getA(), l);
+ }
+ }
+
+ protected void rememberPredecessors(NodePair pair) {
+ if (predecessors.containsKey(pair.getB())) {
+ if (!predecessors.get(pair.getB()).contains(pair)) {
+ predecessors.get(pair.getB()).add(pair);
+ }
+ } else {
+ List<NodePair> l = new ArrayList<>();
+ l.add(pair);
+ predecessors.put(pair.getB(), l);
+ }
+ }
+
+ protected boolean isTerminalNode(Node n) {
+ if (successors.get(n) == null) return false;
+ if (successors.get(n).size() != 1) return false;
+ if (predecessors.get(n) == null) return true;
+ if (predecessors.get(n).size() == 1) {
+ NodePair p1 = successors.get(n).get(0);
+ NodePair p2 = predecessors.get(n).get(0);
+ return p1.equals(p2.swap());
+ }
+ return false;
+ }
+
+ protected void prepare() {
+ Set<NodePair> undirectedEdges = new LinkedHashSet<>();
+ successors.clear();
+ predecessors.clear();
+
+ for (NodePair pair: edges) {
+ if (!undirectedEdges.contains(pair) && !undirectedEdges.contains(pair.swap())) {
+ undirectedEdges.add(pair);
+ }
+ rememberSuccessor(pair);
+ rememberPredecessors(pair);
+ }
+ numUndirectedEges = undirectedEdges.size();
+ }
+
+ /**
+ * Constructs a new {@code NodeGraph}.
+ */
+ public NodeGraph() {
+ edges = new LinkedHashSet<>();
+ }
+
+ /**
+ * Add a node pair.
+ * @param pair node pair
+ */
+ public void add(NodePair pair) {
+ if (!edges.contains(pair)) {
+ edges.add(pair);
+ }
+ }
+
+ /**
+ * Add a list of node pairs.
+ * @param pairs list of node pairs
+ */
+ public void add(Collection<NodePair> pairs) {
+ for (NodePair pair: pairs) {
+ add(pair);
+ }
+ }
+
+ protected Set<Node> getTerminalNodes() {
+ Set<Node> ret = new LinkedHashSet<>();
+ for (Node n: getNodes()) {
+ if (isTerminalNode(n)) {
+ ret.add(n);
+ }
+ }
+ return ret;
+ }
+
+ protected List<NodePair> getOutboundPairs(NodePair pair) {
+ return getOutboundPairs(pair.getB());
+ }
+
+ protected List<NodePair> getOutboundPairs(Node node) {
+ return Optional.ofNullable(successors.get(node)).orElseGet(Collections::emptyList);
+ }
+
+ protected Set<Node> getNodes() {
+ Set<Node> nodes = new LinkedHashSet<>(2 * edges.size());
+ for (NodePair pair: edges) {
+ nodes.add(pair.getA());
+ nodes.add(pair.getB());
+ }
+ return nodes;
+ }
+
+ protected boolean isSpanningWay(Stack<NodePair> way) {
+ return numUndirectedEges == way.size();
+ }
+
+ protected List<Node> buildPathFromNodePairs(Stack<NodePair> path) {
+ List<Node> ret = new LinkedList<>();
+ for (NodePair pair: path) {
+ ret.add(pair.getA());
+ }
+ ret.add(path.peek().getB());
+ return ret;
+ }
+
+ /**
+ * Tries to find a spanning path starting from node <code>startNode</code>.
+ *
+ * Traverses the path in depth-first order.
+ *
+ * @param startNode the start node
+ * @return the spanning path; null, if no path is found
+ */
+ protected List<Node> buildSpanningPath(Node startNode) {
+ if (startNode != null) {
+ Stack<NodePair> path = new Stack<>();
+ Stack<NodePair> nextPairs = new Stack<>();
+ nextPairs.addAll(getOutboundPairs(startNode));
+ while (!nextPairs.isEmpty()) {
+ NodePair cur = nextPairs.pop();
+ if (!path.contains(cur) && !path.contains(cur.swap())) {
+ while (!path.isEmpty() && !path.peek().isPredecessorOf(cur)) {
+ path.pop();
+ }
+ path.push(cur);
+ if (isSpanningWay(path)) return buildPathFromNodePairs(path);
+ nextPairs.addAll(getOutboundPairs(path.peek()));
+ }
+ }
+ }
+ return Collections.emptyList();
+ }
+
+ /**
+ * Tries to find a path through the graph which visits each edge (i.e.
+ * the segment of a way) exactly once.
+ *
+ * @return the path; null, if no path was found
+ */
+ public List<Node> buildSpanningPath() {
+ prepare();
+ // try to find a path from each "terminal node", i.e. from a
+ // node which is connected by exactly one undirected edges (or
+ // two directed edges in opposite direction) to the graph. A
+ // graph built up from way segments is likely to include such
+ // nodes, unless all ways are closed.
+ // In the worst case this loops over all nodes which is very slow for large ways.
+ //
+ Set<Node> nodes = getTerminalNodes();
+ nodes = nodes.isEmpty() ? getNodes() : nodes;
+ for (Node n: nodes) {
+ List<Node> path = buildSpanningPath(n);
+ if (!path.isEmpty())
+ return path;
+ }
+ return null;
+ }
+}
diff --git a/src/org/openstreetmap/josm/data/osm/NodePair.java b/src/org/openstreetmap/josm/data/osm/NodePair.java
new file mode 100644
index 0000000..378b431
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/osm/NodePair.java
@@ -0,0 +1,109 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import java.util.Objects;
+
+import org.openstreetmap.josm.tools.Pair;
+
+/**
+ * A directed pair of nodes (a,b != b,a).
+ * @since 12463 (extracted from CombineWayAction)
+ */
+public class NodePair {
+ private final Node a;
+ private final Node b;
+
+ /**
+ * Constructs a new {@code NodePair}.
+ * @param a The first node
+ * @param b The second node
+ */
+ public NodePair(Node a, Node b) {
+ this.a = a;
+ this.b = b;
+ }
+
+ /**
+ * Constructs a new {@code NodePair}.
+ * @param pair An existing {@code Pair} of nodes
+ */
+ public NodePair(Pair<Node, Node> pair) {
+ this(pair.a, pair.b);
+ }
+
+ /**
+ * Replies the first node.
+ * @return The first node
+ */
+ public Node getA() {
+ return a;
+ }
+
+ /**
+ * Replies the second node
+ * @return The second node
+ */
+ public Node getB() {
+ return b;
+ }
+
+ /**
+ * Determines if this pair is successor of another one (other.b == this.a)
+ * @param other other pair
+ * @return {@code true} if other.b == this.a
+ */
+ public boolean isSuccessorOf(NodePair other) {
+ return other.getB() == a;
+ }
+
+ /**
+ * Determines if this pair is predecessor of another one (this.b == other.a)
+ * @param other other pair
+ * @return {@code true} if this.b == other.a
+ */
+ public boolean isPredecessorOf(NodePair other) {
+ return b == other.getA();
+ }
+
+ /**
+ * Returns the inversed pair.
+ * @return swapped copy
+ */
+ public NodePair swap() {
+ return new NodePair(b, a);
+ }
+
+ @Override
+ public String toString() {
+ return new StringBuilder()
+ .append('[')
+ .append(a.getId())
+ .append(',')
+ .append(b.getId())
+ .append(']')
+ .toString();
+ }
+
+ /**
+ * Determines if this pair contains the given node.
+ * @param n The node to look for
+ * @return {@code true} if {@code n} is in the pair, {@code false} otherwise
+ */
+ public boolean contains(Node n) {
+ return a == n || b == n;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(a, b);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null || getClass() != obj.getClass()) return false;
+ NodePair nodePair = (NodePair) obj;
+ return Objects.equals(a, nodePair.a) &&
+ Objects.equals(b, nodePair.b);
+ }
+}
diff --git a/src/org/openstreetmap/josm/data/osm/NoteData.java b/src/org/openstreetmap/josm/data/osm/NoteData.java
index c9ebf89..77cad62 100644
--- a/src/org/openstreetmap/josm/data/osm/NoteData.java
+++ b/src/org/openstreetmap/josm/data/osm/NoteData.java
@@ -264,7 +264,10 @@ public class NoteData {
dataUpdated();
}
- /** @return The current comparator being used to sort the note list */
+ /**
+ * Returns the current comparator being used to sort the note list.
+ * @return The current comparator being used to sort the note list
+ */
public Comparator<Note> getCurrentSortMethod() {
return comparator;
}
diff --git a/src/org/openstreetmap/josm/data/osm/QuadBuckets.java b/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
index cc2f0f1..0a68387 100644
--- a/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
+++ b/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
@@ -22,7 +22,7 @@ import org.openstreetmap.josm.data.coor.QuadTiling;
* @since 2165
*/
public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
- private static final boolean consistency_testing = false;
+ private static final boolean CONSISTENCY_TESTING = false;
private static final byte NW_INDEX = 1;
private static final byte NE_INDEX = 3;
private static final byte SE_INDEX = 2;
@@ -270,7 +270,7 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
}
void doAdd(T o) {
- if (consistency_testing) {
+ if (CONSISTENCY_TESTING) {
if (o instanceof Node && !matches(o, this)) {
o.getBBox().getIndex(level);
o.getBBox().getIndex(level - 1);
diff --git a/src/org/openstreetmap/josm/data/osm/User.java b/src/org/openstreetmap/josm/data/osm/User.java
index 05dd25a..260d5bb 100644
--- a/src/org/openstreetmap/josm/data/osm/User.java
+++ b/src/org/openstreetmap/josm/data/osm/User.java
@@ -33,7 +33,7 @@ public final class User {
* The anonymous user is a local user used in places where no user is known.
* @see #getAnonymous()
*/
- private static final User anonymous = createLocalUser(tr("<anonymous>"));
+ private static final User ANONYMOUS = createLocalUser(tr("<anonymous>"));
private static long getNextLocalUid() {
uidCounter--;
@@ -130,7 +130,7 @@ public final class User {
* @return The anonymous user
*/
public static User getAnonymous() {
- return anonymous;
+ return ANONYMOUS;
}
/** the user name */
diff --git a/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java b/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
index c66ea69..f17759c 100644
--- a/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
+++ b/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
@@ -28,7 +28,7 @@ import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListen
*/
public class DatasetEventManager implements ActiveLayerChangeListener, Listener {
- private static final DatasetEventManager instance = new DatasetEventManager();
+ private static final DatasetEventManager INSTANCE = new DatasetEventManager();
private final class EdtRunnable implements Runnable {
@Override
@@ -138,7 +138,7 @@ public class DatasetEventManager implements ActiveLayerChangeListener, Listener
* @return the unique instance
*/
public static DatasetEventManager getInstance() {
- return instance;
+ return INSTANCE;
}
private final Queue<AbstractDatasetChangedEvent> eventsInEDT = new LinkedBlockingQueue<>();
diff --git a/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java b/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
index 14c4220..ea24e40 100644
--- a/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
+++ b/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
@@ -31,14 +31,14 @@ import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListen
*/
public class SelectionEventManager implements DataSelectionListener, ActiveLayerChangeListener {
- private static final SelectionEventManager instance = new SelectionEventManager();
+ private static final SelectionEventManager INSTANCE = new SelectionEventManager();
/**
* Returns the unique instance.
* @return the unique instance
*/
public static SelectionEventManager getInstance() {
- return instance;
+ return INSTANCE;
}
private interface ListenerInfo {
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/OffsetIterator.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/OffsetIterator.java
index f594292..6eb4758 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/OffsetIterator.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/OffsetIterator.java
@@ -22,7 +22,7 @@ import org.openstreetmap.josm.tools.Utils;
*/
public class OffsetIterator implements Iterator<MapViewPoint> {
private final MapViewState mapState;
- private final List<Node> nodes;
+ private final List<MapViewPoint> nodes;
private final double offset;
private int idx;
@@ -36,15 +36,28 @@ public class OffsetIterator implements Iterator<MapViewPoint> {
/**
* Creates a new offset iterator
+ * @param nodes The nodes of the original line
+ * @param offset The offset of the line.
+ */
+ public OffsetIterator(List<MapViewPoint> nodes, double offset) {
+ if (nodes.size() < 2) {
+ throw new IllegalArgumentException("There must be at least 2 nodes.");
+ }
+ this.mapState = nodes.get(0).getMapViewState();
+ this.nodes = nodes;
+ this.offset = offset;
+ }
+
+ /**
+ * Creates a new offset iterator
* @param mapState The map view state this iterator is for.
* @param nodes The nodes of the original line
* @param offset The offset of the line.
*/
public OffsetIterator(MapViewState mapState, List<Node> nodes, double offset) {
this.mapState = mapState;
- this.nodes = nodes.stream().filter(Node::isLatLonKnown).collect(Collectors.toList());
+ this.nodes = nodes.stream().filter(Node::isLatLonKnown).map(mapState::getPointFor).collect(Collectors.toList());
this.offset = offset;
- idx = 0;
}
@Override
@@ -159,7 +172,7 @@ public class OffsetIterator implements Iterator<MapViewPoint> {
}
private MapViewPoint getForIndex(int i) {
- return mapState.getPointFor(nodes.get(i));
+ return nodes.get(i);
}
@Override
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java
index dd04a35..7957c90 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java
@@ -92,7 +92,7 @@ public enum PaintColors {
private static volatile Color backgroundColorCache;
- private static final MapPaintSylesUpdateListener styleOverrideListener = new MapPaintSylesUpdateListener() {
+ private static final MapPaintSylesUpdateListener STYLE_OVERRIDE_LISTENER = new MapPaintSylesUpdateListener() {
//TODO: Listen to wireframe map mode changes.
@Override
public void mapPaintStylesUpdated() {
@@ -106,7 +106,7 @@ public enum PaintColors {
};
static {
- MapPaintStyles.addMapPaintSylesUpdateListener(styleOverrideListener);
+ MapPaintStyles.addMapPaintSylesUpdateListener(STYLE_OVERRIDE_LISTENER);
}
PaintColors(String name, Color defaultColor) {
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
index 6556c8b..d23fff1 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
@@ -205,7 +205,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
}
}
- private static Map<Font, Boolean> IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG = new HashMap<>();
+ private static final Map<Font, Boolean> IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG = new HashMap<>();
/**
* Check, if this System has the GlyphVector double translation bug.
@@ -453,7 +453,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
* @param extentThreshold if not null, determines if the partial filled should
* be replaced by plain fill, when it covers a certain fraction of the total area
* @param disabled If this should be drawn with a special disabled style.
- * @param text Ignored. Use {@link #drawText(OsmPrimitive, TextLabel)} instead.
+ * @param text Ignored. Use {@link #drawText} instead.
* @deprecated use {@link #drawArea(Relation r, Color color, MapImage fillImage, Float extent, Float extentThreshold, boolean disabled)}
*/
@Deprecated
@@ -510,7 +510,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
* @param extentThreshold if not null, determines if the partial filled should
* be replaced by plain fill, when it covers a certain fraction of the total area
* @param disabled If this should be drawn with a special disabled style.
- * @param text Ignored. Use {@link #drawText(OsmPrimitive, TextLabel)} instead.
+ * @param text Ignored. Use {@link #drawText} instead.
* @deprecated use {@link #drawArea(Way w, Color color, MapImage fillImage, Float extent, Float extentThreshold, boolean disabled)}
*/
@Deprecated
@@ -581,8 +581,8 @@ public class StyledMapRenderer extends AbstractMapRenderer {
FontRenderContext frc = g.getFontRenderContext();
Rectangle2D bounds = text.font.getStringBounds(s, frc);
- double x = Math.round(p.getInViewX()) + text.xOffset + bounds.getCenterX();
- double y = Math.round(p.getInViewY()) + text.yOffset + bounds.getCenterY();
+ double x = Math.round(p.getInViewX()) + bs.xOffset + bounds.getCenterX();
+ double y = Math.round(p.getInViewY()) + bs.yOffset + bounds.getCenterY();
/**
*
* left-above __center-above___ right-above
@@ -654,14 +654,11 @@ public class StyledMapRenderer extends AbstractMapRenderer {
path.lineTo(it.next());
}
- double startOffset = phase % repeat;
- if (startOffset < 0) {
- startOffset += repeat;
- }
+ double startOffset = computeStartOffset(phase, repeat);
BufferedImage image = pattern.getImage(disabled);
- path.visitClippedLine(startOffset, repeat, (inLineOffset, start, end, startIsOldEnd) -> {
+ path.visitClippedLine(repeat, (inLineOffset, start, end, startIsOldEnd) -> {
final double segmentLength = start.distanceToInView(end);
if (segmentLength < 0.1) {
// avoid odd patterns when zoomed out.
@@ -678,7 +675,8 @@ public class StyledMapRenderer extends AbstractMapRenderer {
g.rotate(Math.atan2(dy, dx));
// The start of the next image
- double imageStart = -(inLineOffset % repeat);
+ // It is shifted by startOffset.
+ double imageStart = -((inLineOffset - startOffset + repeat) % repeat);
while (imageStart < segmentLength) {
int x = (int) imageStart;
@@ -692,6 +690,14 @@ public class StyledMapRenderer extends AbstractMapRenderer {
});
}
+ private static double computeStartOffset(double phase, final double repeat) {
+ double startOffset = phase % repeat;
+ if (startOffset < 0) {
+ startOffset += repeat;
+ }
+ return startOffset;
+ }
+
@Override
public void drawNode(Node n, Color color, int size, boolean fill) {
if (size <= 0 && !n.isHighlighted())
@@ -1089,10 +1095,11 @@ public class StyledMapRenderer extends AbstractMapRenderer {
/**
* Draws a text for the given primitive
* @param osm The primitive to draw the text for
- * @param text The text definition (font/position/.../text content) to draw.
+ * @param text The text definition (font/position/.../text content) to draw
+ * @param labelPositionStrategy The position of the text
* @since 11722
*/
- public void drawText(OsmPrimitive osm, TextLabel text) {
+ public void drawText(OsmPrimitive osm, TextLabel text, PositionForAreaStrategy labelPositionStrategy) {
if (!isShowNames()) {
return;
}
@@ -1107,7 +1114,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
Font defaultFont = g.getFont();
forEachPolygon(osm, path -> {
//TODO: Ignore areas that are out of bounds.
- PositionForAreaStrategy position = text.getLabelPositionStrategy();
+ PositionForAreaStrategy position = labelPositionStrategy;
MapViewPositionAndRotation center = position.findLabelPlacement(path, nb);
if (center != null) {
displayText(osm, text, name, nb, center);
@@ -1290,7 +1297,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
onewayArrowsCasing = new MapViewPath(mapState);
double interval = 60;
- path.visitClippedLine(0, 60, (inLineOffset, start, end, startIsOldEnd) -> {
+ path.visitClippedLine(60, (inLineOffset, start, end, startIsOldEnd) -> {
double segmentLength = start.distanceToInView(end);
if (segmentLength > 0.001) {
final double nx = (end.getInViewX() - start.getInViewX()) / segmentLength;
diff --git a/src/org/openstreetmap/josm/data/preferences/ParametrizedEnumProperty.java b/src/org/openstreetmap/josm/data/preferences/ParametrizedEnumProperty.java
index 66f6230..c71834f 100644
--- a/src/org/openstreetmap/josm/data/preferences/ParametrizedEnumProperty.java
+++ b/src/org/openstreetmap/josm/data/preferences/ParametrizedEnumProperty.java
@@ -3,6 +3,11 @@ package org.openstreetmap.josm.data.preferences;
import org.openstreetmap.josm.Main;
+/**
+ * Abstract base class for properties with {@link Enum} value, where the preference
+ * key is generated from a list of parameters.
+ * @param <T> the {@code Enum} class
+ */
public abstract class ParametrizedEnumProperty<T extends Enum<T>> {
protected final T defaultValue;
diff --git a/src/org/openstreetmap/josm/data/projection/ProjectionChangeListener.java b/src/org/openstreetmap/josm/data/projection/ProjectionChangeListener.java
index 6ea8ab2..280fde9 100644
--- a/src/org/openstreetmap/josm/data/projection/ProjectionChangeListener.java
+++ b/src/org/openstreetmap/josm/data/projection/ProjectionChangeListener.java
@@ -1,6 +1,9 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.projection;
+/**
+ * Interface for listeners to get notified when the (global) projection changes.
+ */
@FunctionalInterface
public interface ProjectionChangeListener {
void projectionChanged(Projection oldValue, Projection newValue);
diff --git a/src/org/openstreetmap/josm/data/projection/ProjectionConfigurationException.java b/src/org/openstreetmap/josm/data/projection/ProjectionConfigurationException.java
index 54ffc14..61ee2ec 100644
--- a/src/org/openstreetmap/josm/data/projection/ProjectionConfigurationException.java
+++ b/src/org/openstreetmap/josm/data/projection/ProjectionConfigurationException.java
@@ -1,6 +1,13 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.projection;
+/**
+ * Exception thrown when a projection cannot be constructed due to invalid input
+ * parameters.
+ *
+ * Used mainly in {@link CustomProjection}, where a parameter string is parsed
+ * and converted to a projection.
+ */
public class ProjectionConfigurationException extends Exception {
/**
diff --git a/src/org/openstreetmap/josm/data/projection/datum/AbstractDatum.java b/src/org/openstreetmap/josm/data/projection/datum/AbstractDatum.java
index 1ed7fcb..153fdf9 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/AbstractDatum.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/AbstractDatum.java
@@ -3,6 +3,11 @@ package org.openstreetmap.josm.data.projection.datum;
import org.openstreetmap.josm.data.projection.Ellipsoid;
+/**
+ * Abstract base class for {@link Datum} implementations.
+ *
+ * Adds common fields and access methods.
+ */
public abstract class AbstractDatum implements Datum {
protected String name;
diff --git a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
index ce2f7ec..7bda6a6 100644
--- a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
@@ -295,7 +295,7 @@ public final class DomainValidator extends AbstractValidator {
// WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search
private static final String[] GENERIC_TLDS = new String[] {
- // Taken from Version 2017063000, Last Updated Fri Jun 30 07:07:01 2017 UTC
+ // Taken from Version 2017071002, Last Updated Tue Jul 11 07:07:02 2017 UTC
"aaa", // aaa American Automobile Association, Inc.
"aarp", // aarp AARP
"abarth", // abarth Fiat Chrysler Automobiles N.V.
@@ -960,6 +960,7 @@ public final class DomainValidator extends AbstractValidator {
"men", // men Exclusive Registry Limited
"menu", // menu Wedding TLD2, LLC
"meo", // meo PT Comunicacoes S.A.
+ "merckmsd", // merckmsd MSD Registry Holdings, Inc.
"metlife", // metlife MetLife Services and Solutions, LLC
"miami", // miami Top Level Domain Holdings Limited
"microsoft", // microsoft Microsoft Corporation
diff --git a/src/org/openstreetmap/josm/data/validation/tests/InternetTags.java b/src/org/openstreetmap/josm/data/validation/tests/InternetTags.java
index 253e832..ffcae2b 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/InternetTags.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/InternetTags.java
@@ -29,7 +29,7 @@ public class InternetTags extends Test {
/**
* List of keys subject to URL validation.
*/
- private static String[] URL_KEYS = new String[] {
+ private static final String[] URL_KEYS = new String[] {
"url", "source:url",
"website", "contact:website", "heritage:website", "source:website"
};
@@ -37,7 +37,7 @@ public class InternetTags extends Test {
/**
* List of keys subject to email validation.
*/
- private static String[] EMAIL_KEYS = new String[] {
+ private static final String[] EMAIL_KEYS = new String[] {
"email", "contact:email"
};
diff --git a/src/org/openstreetmap/josm/data/validation/tests/Lanes.java b/src/org/openstreetmap/josm/data/validation/tests/Lanes.java
index 8e5e934..f26cbc7 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/Lanes.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/Lanes.java
@@ -24,6 +24,7 @@ public class Lanes extends Test.TagTest {
"source:lanes",
"note:lanes",
"proposed:lanes",
+ "source:proposed:lanes",
"piste:lanes",
};
diff --git a/src/org/openstreetmap/josm/gui/MapFrame.java b/src/org/openstreetmap/josm/gui/MapFrame.java
index a1c8924..d94e2bd 100644
--- a/src/org/openstreetmap/josm/gui/MapFrame.java
+++ b/src/org/openstreetmap/josm/gui/MapFrame.java
@@ -172,6 +172,8 @@ public class MapFrame extends JPanel implements Destroyable, ActiveLayerChangeLi
public final DrawAction mapModeDraw;
/** Zoom mode */
public final ZoomAction mapModeZoom;
+ /** Delete mode */
+ public final DeleteAction mapModeDelete;
/** Select Lasso mode */
public LassoModeAction mapModeSelectLasso;
@@ -238,12 +240,13 @@ public class MapFrame extends JPanel implements Destroyable, ActiveLayerChangeLi
mapModeSelectLasso = new LassoModeAction();
mapModeDraw = new DrawAction();
mapModeZoom = new ZoomAction(this);
+ mapModeDelete = new DeleteAction();
addMapMode(new IconToggleButton(mapModeSelect));
addMapMode(new IconToggleButton(mapModeSelectLasso, true));
addMapMode(new IconToggleButton(mapModeDraw));
addMapMode(new IconToggleButton(mapModeZoom, true));
- addMapMode(new IconToggleButton(new DeleteAction(), true));
+ addMapMode(new IconToggleButton(mapModeDelete, true));
addMapMode(new IconToggleButton(new ParallelWayAction(this), true));
addMapMode(new IconToggleButton(new ExtrudeAction(), true));
addMapMode(new IconToggleButton(new ImproveWayAccuracyAction(), false));
diff --git a/src/org/openstreetmap/josm/gui/MapSlider.java b/src/org/openstreetmap/josm/gui/MapSlider.java
index 59bfa06..009e8bb 100644
--- a/src/org/openstreetmap/josm/gui/MapSlider.java
+++ b/src/org/openstreetmap/josm/gui/MapSlider.java
@@ -19,7 +19,7 @@ import org.openstreetmap.josm.gui.help.Helpful;
*/
class MapSlider extends JSlider implements PropertyChangeListener, ChangeListener, Helpful {
- private static final double zoomStep = 1.1;
+ private static final double ZOOM_STEP = 1.1;
private final MapView mv;
private boolean preventChange;
private int lastValue;
@@ -39,7 +39,7 @@ class MapSlider extends JSlider implements PropertyChangeListener, ChangeListene
@Override
public void propertyChange(PropertyChangeEvent evt) {
double maxScale = this.mv.getMaxScale();
- int zoom = (int) Math.round(Math.log(maxScale/mv.getScale())/Math.log(zoomStep));
+ int zoom = (int) Math.round(Math.log(maxScale/mv.getScale())/Math.log(ZOOM_STEP));
preventChange = true;
setValue(zoom);
lastValue = zoom;
@@ -58,7 +58,7 @@ class MapSlider extends JSlider implements PropertyChangeListener, ChangeListene
}
} else {
double maxScale = this.mv.getMaxScale();
- double scale = maxScale/Math.pow(zoomStep, getValue());
+ double scale = maxScale/Math.pow(ZOOM_STEP, getValue());
double snapped = mv.scaleFloor(scale);
mv.zoomTo(this.mv.getCenter(), snapped);
}
diff --git a/src/org/openstreetmap/josm/gui/MapViewState.java b/src/org/openstreetmap/josm/gui/MapViewState.java
index 7e772ff..8d40c7a 100644
--- a/src/org/openstreetmap/josm/gui/MapViewState.java
+++ b/src/org/openstreetmap/josm/gui/MapViewState.java
@@ -418,6 +418,14 @@ public final class MapViewState implements Serializable {
* @author Michael Zangl
*/
public abstract class MapViewPoint {
+ /**
+ * Gets the map view state this path is used for.
+ * @return The state.
+ * @since 12505
+ */
+ public MapViewState getMapViewState() {
+ return MapViewState.this;
+ }
/**
* Get this point in view coordinates.
diff --git a/src/org/openstreetmap/josm/gui/NoteSortDialog.java b/src/org/openstreetmap/josm/gui/NoteSortDialog.java
index 4a63328..86274a4 100644
--- a/src/org/openstreetmap/josm/gui/NoteSortDialog.java
+++ b/src/org/openstreetmap/josm/gui/NoteSortDialog.java
@@ -72,7 +72,10 @@ public class NoteSortDialog extends ExtendedDialog {
showDialog();
}
- /** @return Note comparator that the user has selected */
+ /**
+ * Returns the Note comparator that the user has selected.
+ * @return Note comparator that the user has selected
+ */
public Comparator<Note> getSelectedComparator() {
if (dateSort.isSelected()) {
return Note.DATE_COMPARATOR;
diff --git a/src/org/openstreetmap/josm/gui/autofilter/AutoFilter.java b/src/org/openstreetmap/josm/gui/autofilter/AutoFilter.java
index a3ce520..634dcab 100644
--- a/src/org/openstreetmap/josm/gui/autofilter/AutoFilter.java
+++ b/src/org/openstreetmap/josm/gui/autofilter/AutoFilter.java
@@ -64,4 +64,9 @@ public class AutoFilter {
AutoFilter other = (AutoFilter) obj;
return Objects.equals(filter, other.filter);
}
+
+ @Override
+ public String toString() {
+ return "AutoFilter [label=" + label + ", description=" + description + ", filter=" + filter + ']';
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/autofilter/AutoFilterButton.java b/src/org/openstreetmap/josm/gui/autofilter/AutoFilterButton.java
index 38acf2a..ec90d94 100644
--- a/src/org/openstreetmap/josm/gui/autofilter/AutoFilterButton.java
+++ b/src/org/openstreetmap/josm/gui/autofilter/AutoFilterButton.java
@@ -33,7 +33,7 @@ public class AutoFilterButton extends JButton {
@Override
public synchronized void actionPerformed(ActionEvent e) {
AutoFilterManager afm = AutoFilterManager.getInstance();
- if (afm.getCurrentAutoFilter() == filter) {
+ if (filter.equals(afm.getCurrentAutoFilter())) {
afm.setCurrentAutoFilter(null);
Main.map.filterDialog.getFilterModel().executeFilters();
} else {
diff --git a/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java b/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java
index 449fe80..d677589 100644
--- a/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java
+++ b/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java
@@ -46,6 +46,11 @@ import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.MapFrame.MapModeChangeListener;
import org.openstreetmap.josm.gui.NavigatableComponent;
import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
import org.openstreetmap.josm.gui.widgets.OSDLabel;
@@ -54,7 +59,8 @@ import org.openstreetmap.josm.gui.widgets.OSDLabel;
* when the map contents, location or zoom changes.
* @since 12400
*/
-public final class AutoFilterManager implements ZoomChangeListener, MapModeChangeListener, DataSetListener, PreferenceChangedListener {
+public final class AutoFilterManager
+implements ZoomChangeListener, MapModeChangeListener, DataSetListener, PreferenceChangedListener, LayerChangeListener {
/**
* Property to determines if the auto filter feature is enabled.
@@ -116,6 +122,7 @@ public final class AutoFilterManager implements ZoomChangeListener, MapModeChang
MapFrame.addMapModeChangeListener(this);
Main.pref.addPreferenceChangeListener(this);
NavigatableComponent.addZoomChangeListener(this);
+ Main.getLayerManager().addLayerChangeListener(this);
DatasetEventManager.getInstance().addDatasetListener(this, FireMode.IN_EDT_CONSOLIDATED);
registerAutoFilterRules(AutoFilterRule.defaultRules());
}
@@ -123,7 +130,12 @@ public final class AutoFilterManager implements ZoomChangeListener, MapModeChang
private synchronized void updateButtons() {
if (enabledRule != null && Main.map != null
&& enabledRule.getMinZoomLevel() <= Selector.GeneralSelector.scale2level(Main.map.mapView.getDist100Pixel())) {
+ // Retrieve the values from current rule visible on screen
NavigableSet<String> values = getNumericValues(enabledRule.getKey(), enabledRule.getValueComparator());
+ // Make sure current auto filter button remains visible even if no data is found, to allow user to disable it
+ if (currentAutoFilter != null) {
+ values.add(currentAutoFilter.getFilter().text.split("=")[1]);
+ }
if (!values.equals(buttons.keySet())) {
removeAllButtons();
addNewButtons(values);
@@ -353,7 +365,10 @@ public final class AutoFilterManager implements ZoomChangeListener, MapModeChang
model.addFilter(autoFilter.getFilter());
model.executeFilters();
if (model.isChanged()) {
- Main.getLayerManager().getEditLayer().invalidate();
+ OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
+ if (editLayer != null) {
+ editLayer.invalidate();
+ }
}
}
}
@@ -392,4 +407,21 @@ public final class AutoFilterManager implements ZoomChangeListener, MapModeChang
updateButtons();
}
}
+
+ @Override
+ public void layerAdded(LayerAddEvent e) {
+ // Do nothing
+ }
+
+ @Override
+ public void layerRemoving(LayerRemoveEvent e) {
+ if (Main.getLayerManager().getEditLayer() == null) {
+ resetCurrentAutoFilter();
+ }
+ }
+
+ @Override
+ public void layerOrderChanged(LayerOrderChangeEvent e) {
+ // Do nothing
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java b/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java
index 9959c58..070bf90 100644
--- a/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java
+++ b/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java
@@ -30,7 +30,7 @@ import org.openstreetmap.josm.Main;
public class SlippyMapControler extends MouseAdapter {
/** A Timer for smoothly moving the map area */
- private static final Timer timer = new Timer(true);
+ private static final Timer TIMER = new Timer(true);
/** Does the moving */
private MoveTask moveTask = new MoveTask();
@@ -228,7 +228,7 @@ public class SlippyMapControler extends MouseAdapter {
if (newMoveTaskState != scheduled) {
scheduled = newMoveTaskState;
if (newMoveTaskState) {
- timer.schedule(this, 0, timerInterval);
+ TIMER.schedule(this, 0, timerInterval);
} else {
// We have to create a new instance because rescheduling a
// once canceled TimerTask is not possible
diff --git a/src/org/openstreetmap/josm/gui/datatransfer/importers/TextTagPaster.java b/src/org/openstreetmap/josm/gui/datatransfer/importers/TextTagPaster.java
index 8a36402..1356266 100644
--- a/src/org/openstreetmap/josm/gui/datatransfer/importers/TextTagPaster.java
+++ b/src/org/openstreetmap/josm/gui/datatransfer/importers/TextTagPaster.java
@@ -19,7 +19,7 @@ import org.openstreetmap.josm.tools.TextTagParser;
* @since 10604
*/
public final class TextTagPaster extends AbstractTagPaster {
- private static final String help = ht("/Action/PasteTags");
+ private static final String HELP = ht("/Action/PasteTags");
/**
* Create a new {@link TextTagPaster}
@@ -46,7 +46,7 @@ public final class TextTagPaster extends AbstractTagPaster {
protected Map<String, String> getTags(TransferSupport support) throws UnsupportedFlavorException, IOException {
Map<String, String> tags = getTagsImpl(support);
if (tags.isEmpty()) {
- TextTagParser.showBadBufferMessage(help);
+ TextTagParser.showBadBufferMessage(HELP);
throw new IOException("Invalid tags to paste.");
}
if (!TextTagParser.validateTags(tags)) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
index 1d9da56..c9eab96 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
@@ -120,12 +120,14 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
* builds the GUI
*/
private void build() {
- model = new ConflictListModel();
+ synchronized (this) {
+ model = new ConflictListModel();
- lstConflicts = new JList<>(model);
- lstConflicts.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
- lstConflicts.setCellRenderer(new OsmPrimitivRenderer());
- lstConflicts.addMouseListener(new MouseEventHandler());
+ lstConflicts = new JList<>(model);
+ lstConflicts.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+ lstConflicts.setCellRenderer(new OsmPrimitivRenderer());
+ lstConflicts.addMouseListener(new MouseEventHandler());
+ }
addListSelectionListener(e -> Main.map.mapView.repaint());
SideButton btnResolve = new SideButton(actResolve);
@@ -164,7 +166,7 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
* @param listener the ListSelectionListener
* @since 5958
*/
- public void addListSelectionListener(ListSelectionListener listener) {
+ public synchronized void addListSelectionListener(ListSelectionListener listener) {
lstConflicts.getSelectionModel().addListSelectionListener(listener);
}
@@ -173,7 +175,7 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
* @param listener the ListSelectionListener
* @since 5958
*/
- public void removeListSelectionListener(ListSelectionListener listener) {
+ public synchronized void removeListSelectionListener(ListSelectionListener listener) {
lstConflicts.getSelectionModel().removeListSelectionListener(listener);
}
@@ -190,21 +192,22 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
* Launches a conflict resolution dialog for the first selected conflict
*/
private void resolve() {
- if (conflicts == null || model.getSize() == 0)
- return;
-
- int index = lstConflicts.getSelectedIndex();
- if (index < 0) {
- index = 0;
- }
+ synchronized (this) {
+ if (conflicts == null || model.getSize() == 0)
+ return;
- Conflict<? extends OsmPrimitive> c = conflicts.get(index);
- ConflictResolutionDialog dialog = new ConflictResolutionDialog(Main.parent);
- dialog.getConflictResolver().populate(c);
- dialog.showDialog();
+ int index = lstConflicts.getSelectedIndex();
+ if (index < 0) {
+ index = 0;
+ }
- lstConflicts.setSelectedIndex(index);
+ Conflict<? extends OsmPrimitive> c = conflicts.get(index);
+ ConflictResolutionDialog dialog = new ConflictResolutionDialog(Main.parent);
+ dialog.getConflictResolver().populate(c);
+ dialog.showDialog();
+ lstConflicts.setSelectedIndex(index);
+ }
Main.map.mapView.repaint();
}
@@ -213,14 +216,16 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
*/
public void refreshView() {
OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
- conflicts = editLayer == null ? new ConflictCollection() : editLayer.getConflicts();
+ synchronized (this) {
+ conflicts = editLayer == null ? new ConflictCollection() : editLayer.getConflicts();
+ }
GuiHelper.runInEDT(() -> {
model.fireContentChanged();
updateTitle();
});
}
- private void updateTitle() {
+ private synchronized void updateTitle() {
int conflictsCount = conflicts.size();
if (conflictsCount > 0) {
setTitle(trn("Conflict: {0} unresolved", "Conflicts: {0} unresolved", conflictsCount, conflictsCount) +
@@ -246,11 +251,13 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
return;
g.setColor(preferencesColor);
Visitor conflictPainter = new ConflictPainter(nc, g);
- for (OsmPrimitive o : lstConflicts.getSelectedValuesList()) {
- if (conflicts == null || !conflicts.hasConflictForMy(o)) {
- continue;
+ synchronized (this) {
+ for (OsmPrimitive o : lstConflicts.getSelectedValuesList()) {
+ if (conflicts == null || !conflicts.hasConflictForMy(o)) {
+ continue;
+ }
+ conflicts.getConflictForMy(o).getTheir().accept(conflictPainter);
}
- conflicts.getConflictForMy(o).getTheir().accept(conflictPainter);
}
}
@@ -280,7 +287,7 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
*
* @return the conflict collection currently held by this dialog; may be null
*/
- public ConflictCollection getConflicts() {
+ public synchronized ConflictCollection getConflicts() {
return conflicts;
}
@@ -289,7 +296,7 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
*
* @return Conflict
*/
- public Conflict<? extends OsmPrimitive> getSelectedConflict() {
+ public synchronized Conflict<? extends OsmPrimitive> getSelectedConflict() {
if (conflicts == null || model.getSize() == 0)
return null;
@@ -298,7 +305,7 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
return index >= 0 ? conflicts.get(index) : null;
}
- private boolean isConflictSelected() {
+ private synchronized boolean isConflictSelected() {
final ListSelectionModel selModel = lstConflicts.getSelectionModel();
return selModel.getMinSelectionIndex() >= 0 && selModel.getMaxSelectionIndex() >= selModel.getMinSelectionIndex();
}
@@ -315,7 +322,7 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
}
@Override
- public void selectionChanged(SelectionChangeEvent event) {
+ public synchronized void selectionChanged(SelectionChangeEvent event) {
lstConflicts.setValueIsAdjusting(true);
lstConflicts.clearSelection();
for (OsmPrimitive osm : event.getSelection()) {
@@ -415,18 +422,18 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
}
@Override
- public OsmPrimitive getElementAt(int index) {
+ public synchronized OsmPrimitive getElementAt(int index) {
if (index < 0 || index >= getSize())
return null;
return conflicts.get(index).getMy();
}
@Override
- public int getSize() {
+ public synchronized int getSize() {
return conflicts != null ? conflicts.size() : 0;
}
- public int indexOf(OsmPrimitive my) {
+ public synchronized int indexOf(OsmPrimitive my) {
if (conflicts != null) {
for (int i = 0; i < conflicts.size(); i++) {
if (conflicts.get(i).isMatchingMy(my))
@@ -436,7 +443,7 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
return -1;
}
- public OsmPrimitive get(int idx) {
+ public synchronized OsmPrimitive get(int idx) {
return conflicts != null ? conflicts.get(idx).getMy() : null;
}
}
@@ -468,8 +475,10 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
@Override
public void actionPerformed(ActionEvent e) {
Collection<OsmPrimitive> sel = new LinkedList<>();
- for (OsmPrimitive o : lstConflicts.getSelectedValuesList()) {
- sel.add(o);
+ synchronized (this) {
+ for (OsmPrimitive o : lstConflicts.getSelectedValuesList()) {
+ sel.add(o);
+ }
}
DataSet ds = Main.getLayerManager().getEditDataSet();
if (ds != null) { // Can't see how it is possible but it happened in #7942
@@ -498,12 +507,14 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
public void actionPerformed(ActionEvent e) {
final ConflictResolver resolver = new ConflictResolver();
final List<Command> commands = new ArrayList<>();
- for (OsmPrimitive osmPrimitive : lstConflicts.getSelectedValuesList()) {
- Conflict<? extends OsmPrimitive> c = conflicts.getConflictForMy(osmPrimitive);
- if (c != null) {
- resolver.populate(c);
- resolver.decideRemaining(type);
- commands.add(resolver.buildResolveCommand());
+ synchronized (this) {
+ for (OsmPrimitive osmPrimitive : lstConflicts.getSelectedValuesList()) {
+ Conflict<? extends OsmPrimitive> c = conflicts.getConflictForMy(osmPrimitive);
+ if (c != null) {
+ resolver.populate(c);
+ resolver.decideRemaining(type);
+ commands.add(resolver.buildResolveCommand());
+ }
}
}
Main.main.undoRedo.add(new SequenceCommand(name, commands));
diff --git a/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
index 998da6b..e52467e 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
@@ -177,7 +177,7 @@ public class RelationListDialog extends ToggleDialog
// Edit relation on Ctrl-Enter
displaylist.getActionMap().put("edit", editAction);
- displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.CTRL_MASK), "edit");
+ displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.CTRL_DOWN_MASK), "edit");
// Do not hide copy action because of default JList override (fix #9815)
displaylist.getActionMap().put("copy", Main.main.menu.copy);
@@ -420,7 +420,7 @@ public class RelationListDialog extends ToggleDialog
}
private boolean isValid(Relation r) {
- return !r.isDeleted() && r.isVisible() && !r.isIncomplete();
+ return !r.isDeleted() && !r.isIncomplete();
}
public void setRelations(Collection<Relation> relations) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
index f592dc8..9a9d531 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
@@ -634,19 +634,14 @@ public class ChangesetCacheManager extends JFrame {
@Override
public void actionPerformed(ActionEvent e) {
Window parent = GuiHelper.getWindowAncestorFor(e);
- JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
- if (im.isAnonymous()) {
+ try {
+ ChangesetQuery query = ChangesetQuery.forCurrentUser();
+ if (!GraphicsEnvironment.isHeadless()) {
+ ChangesetCacheManager.getInstance().runDownloadTask(new ChangesetQueryTask(parent, query));
+ }
+ } catch (IllegalStateException ex) {
alertAnonymousUser(parent);
- return;
- }
- ChangesetQuery query = new ChangesetQuery();
- if (im.isFullyIdentified()) {
- query = query.forUser(im.getUserId());
- } else {
- query = query.forUser(im.getUserName());
- }
- if (!GraphicsEnvironment.isHeadless()) {
- ChangesetCacheManager.getInstance().runDownloadTask(new ChangesetQueryTask(parent, query));
+ Main.trace(ex);
}
}
}
@@ -694,6 +689,15 @@ public class ChangesetCacheManager extends JFrame {
}
/**
+ * Returns the changeset cache model.
+ * @return the changeset cache model
+ * @since 12495
+ */
+ public ChangesetCacheManagerModel getModel() {
+ return model;
+ }
+
+ /**
* Selects the changesets in <code>changests</code>, provided the
* respective changesets are already present in the local changeset cache.
*
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
index d61d4af..1881846 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
@@ -138,7 +138,7 @@ public class ChangesetCacheManagerModel extends AbstractTableModel implements Ch
}
@Override
- public Object getValueAt(int row, int column) {
+ public Changeset getValueAt(int row, int column) {
return data.get(row);
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java
index 459794c..781a130 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java
@@ -18,8 +18,8 @@ import org.openstreetmap.josm.data.osm.Changeset;
public class ChangesetCacheTableCellRenderer extends AbstractCellRenderer {
protected void renderUploadComment(Changeset cs) {
- String comment = cs.get("comment");
- if (comment == null || comment.trim().isEmpty()) {
+ String comment = cs.getComment();
+ if (comment.trim().isEmpty()) {
setText(trc("changeset.upload-comment", "empty"));
setFont(UIManager.getFont("Table.font").deriveFont(Font.ITALIC));
} else {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
index a5b6ed6..9147fbe 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
@@ -220,8 +220,7 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
String msg;
if (cs == null) return;
tfID.setText(Integer.toString(cs.getId()));
- String comment = cs.get("comment");
- taComment.setText(comment == null ? "" : comment);
+ taComment.setText(cs.getComment());
if (cs.isOpen()) {
msg = trc("changeset.state", "Open");
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java
index 606ba62..57f48f8 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java
@@ -41,11 +41,11 @@ public class ChangesetListCellRenderer extends JLabel implements ListCellRendere
if (cs.isIncomplete()) {
sb.append(tr("{0} [incomplete]", cs.getId()));
} else {
- String comment = cs.get("comment");
+ String comment = cs.getComment();
sb.append(cs.getId())
.append(" - ")
.append(cs.isOpen() ? tr("open") : tr("closed"));
- if (comment != null) {
+ if (!comment.isEmpty()) {
sb.append(" - '").append(comment).append('\'');
}
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
index eecb25b..a37710e 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
@@ -448,7 +448,7 @@ implements SelectionChangedListener, ActiveLayerChangeListener, DataSetListenerA
tagTable.setTransferHandler(null);
tagTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
- .put(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK), "onCopy");
+ .put(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_DOWN_MASK), "onCopy");
tagTable.getActionMap().put("onCopy", copyKeyValueAction);
// allow using enter to add tags for all look&feel configurations
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java b/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
index 498ec4d..72e7490 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
@@ -721,7 +721,7 @@ public class TagEditHelper {
// Add tag on Shift-Enter
mainPanel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
- KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.SHIFT_MASK), "addAndContinue");
+ KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.SHIFT_DOWN_MASK), "addAndContinue");
mainPanel.getActionMap().put("addAndContinue", new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
@@ -813,7 +813,7 @@ public class TagEditHelper {
Shortcut.findShortcut(KeyEvent.VK_1, commandDownMask).ifPresent(sc ->
lines.add(sc.getKeyText() + ' ' + tr("to apply first suggestion"))
);
- lines.add(KeyEvent.getKeyModifiersText(KeyEvent.SHIFT_MASK)+'+'+KeyEvent.getKeyText(KeyEvent.VK_ENTER) + ' '
+ lines.add(Shortcut.getKeyText(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.SHIFT_DOWN_MASK)) + ' '
+tr("to add without closing the dialog"));
Shortcut.findShortcut(KeyEvent.VK_1, commandDownMask | KeyEvent.SHIFT_DOWN_MASK).ifPresent(sc ->
lines.add(sc.getKeyText() + ' ' + tr("to add first suggestion without closing the dialog"))
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java
index bfac520..3e5e740 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java
@@ -16,11 +16,11 @@ import org.openstreetmap.josm.tools.ImageProvider;
public class MemberTableLinkedCellRenderer extends MemberTableCellRenderer {
- private static final Image arrowUp = ImageProvider.get("dialogs/relation", "arrowup").getImage();
- private static final Image arrowDown = ImageProvider.get("dialogs/relation", "arrowdown").getImage();
- private static final Image corners = ImageProvider.get("dialogs/relation", "roundedcorners").getImage();
- private static final Image roundabout_right = ImageProvider.get("dialogs/relation", "roundabout_right_tiny").getImage();
- private static final Image roundabout_left = ImageProvider.get("dialogs/relation", "roundabout_left_tiny").getImage();
+ private static final Image ARROW_UP = ImageProvider.get("dialogs/relation", "arrowup").getImage();
+ private static final Image ARROW_DOWN = ImageProvider.get("dialogs/relation", "arrowdown").getImage();
+ private static final Image CORNERS = ImageProvider.get("dialogs/relation", "roundedcorners").getImage();
+ private static final Image ROUNDABOUT_RIGHT = ImageProvider.get("dialogs/relation", "roundabout_right_tiny").getImage();
+ private static final Image ROUNDABOUT_LEFT = ImageProvider.get("dialogs/relation", "roundabout_left_tiny").getImage();
private transient WayConnectionType value = new WayConnectionType();
@Override
@@ -74,8 +74,8 @@ public class MemberTableLinkedCellRenderer extends MemberTableCellRenderer {
if (value.isLoop) {
g.setColor(Color.black);
y1 = 5;
- g.drawImage(corners, xoff, y1-3, xoff+3, y1, 0, 0, 3, 3, new Color(0, 0, 0, 0), null);
- g.drawImage(corners, xoff+xloop-2, y1-3, xoff+xloop+1, y1, 2, 0, 5, 3, new Color(0, 0, 0, 0), null);
+ g.drawImage(CORNERS, xoff, y1-3, xoff+3, y1, 0, 0, 3, 3, new Color(0, 0, 0, 0), null);
+ g.drawImage(CORNERS, xoff+xloop-2, y1-3, xoff+xloop+1, y1, 2, 0, 5, 3, new Color(0, 0, 0, 0), null);
g.drawLine(xoff+3, y1-3, xoff+xloop-3, y1-3);
} else {
g.setColor(Color.red);
@@ -102,7 +102,7 @@ public class MemberTableLinkedCellRenderer extends MemberTableCellRenderer {
y2 = ymax - 5;
g.fillRect(xoff-1, y2+2, 3, 3);
g.drawLine(xoff, y2, xoff, y2+2);
- g.drawImage(corners, xoff+xloop-2, y2+1, xoff+xloop+1, y2+4, 2, 2, 5, 5, new Color(0, 0, 0, 0), null);
+ g.drawImage(CORNERS, xoff+xloop-2, y2+1, xoff+xloop+1, y2+4, 2, 2, 5, 5, new Color(0, 0, 0, 0), null);
g.drawLine(xoff+3-1, y2+3, xoff+xloop-3, y2+3);
} else {
g.setColor(Color.red);
@@ -159,18 +159,18 @@ public class MemberTableLinkedCellRenderer extends MemberTableCellRenderer {
Image arrow;
switch (value.direction) {
case FORWARD:
- arrow = arrowDown;
+ arrow = ARROW_DOWN;
break;
case BACKWARD:
- arrow = arrowUp;
+ arrow = ARROW_UP;
break;
default:
arrow = null;
}
if (value.direction == Direction.ROUNDABOUT_LEFT) {
- g.drawImage(roundabout_left, xoff-6, 1, null);
+ g.drawImage(ROUNDABOUT_LEFT, xoff-6, 1, null);
} else if (value.direction == Direction.ROUNDABOUT_RIGHT) {
- g.drawImage(roundabout_right, xoff-6, 1, null);
+ g.drawImage(ROUNDABOUT_RIGHT, xoff-6, 1, null);
}
if (!value.isOnewayLoopForwardPart && !value.isOnewayLoopBackwardPart &&
@@ -179,10 +179,10 @@ public class MemberTableLinkedCellRenderer extends MemberTableCellRenderer {
}
if (value.isOnewayLoopBackwardPart && value.isOnewayLoopForwardPart) {
- if (arrow == arrowDown) {
- arrow = arrowUp;
- } else if (arrow == arrowUp) {
- arrow = arrowDown;
+ if (arrow == ARROW_DOWN) {
+ arrow = ARROW_UP;
+ } else if (arrow == ARROW_UP) {
+ arrow = ARROW_DOWN;
}
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java
index 41df31f..ddcdcf2 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java
@@ -2,6 +2,7 @@
package org.openstreetmap.josm.gui.dialogs.relation.sort;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -25,13 +26,12 @@ public class RelationSorter {
List<RelationMember> sortMembers(List<RelationMember> list);
}
- private static final Collection<AdditionalSorter> additionalSorters = new ArrayList<>();
- static {
+ private static final Collection<AdditionalSorter> ADDITIONAL_SORTERS = Arrays.asList(
// first adequate sorter is used, so order matters
- additionalSorters.add(new AssociatedStreetRoleStreetSorter());
- additionalSorters.add(new AssociatedStreetRoleAddressHouseSorter());
- additionalSorters.add(new PublicTransportRoleStopPlatformSorter());
- }
+ new AssociatedStreetRoleStreetSorter(),
+ new AssociatedStreetRoleAddressHouseSorter(),
+ new PublicTransportRoleStopPlatformSorter()
+ );
/**
* Class that sorts the {@code street} members of
@@ -143,7 +143,7 @@ public class RelationSorter {
// Dispatch members to the first adequate sorter
for (RelationMember m : relationMembers) {
boolean wasAdded = false;
- for (AdditionalSorter sorter : additionalSorters) {
+ for (AdditionalSorter sorter : ADDITIONAL_SORTERS) {
if (sorter.acceptsMember(m)) {
List<RelationMember> list;
list = customMap.get(sorter);
diff --git a/src/org/openstreetmap/josm/gui/download/BookmarkList.java b/src/org/openstreetmap/josm/gui/download/BookmarkList.java
index f39245c..5947e99 100644
--- a/src/org/openstreetmap/josm/gui/download/BookmarkList.java
+++ b/src/org/openstreetmap/josm/gui/download/BookmarkList.java
@@ -4,24 +4,41 @@ package org.openstreetmap.josm.gui.download;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Component;
+import java.awt.GraphicsEnvironment;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import javax.swing.DefaultListModel;
+import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.ListCellRenderer;
import javax.swing.UIManager;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.downloadtasks.ChangesetQueryTask;
import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.data.osm.UserInfo;
+import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.gui.MapViewState;
+import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetCacheManager;
+import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.ChangesetQuery;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
/**
* List class that read and save its content from the bookmark file.
@@ -30,11 +47,18 @@ import org.openstreetmap.josm.tools.ImageProvider;
public class BookmarkList extends JList<BookmarkList.Bookmark> {
/**
+ * The maximum number of changeset bookmarks to maintain in list.
+ * @since 12495
+ */
+ public static final IntegerProperty MAX_CHANGESET_BOOKMARKS = new IntegerProperty("bookmarks.changesets.max-entries", 15);
+
+ /**
* Class holding one bookmarkentry.
*/
public static class Bookmark implements Comparable<Bookmark> {
private String name;
private Bounds area;
+ private ImageIcon icon;
/**
* Constructs a new {@code Bookmark} with the given contents.
@@ -47,6 +71,7 @@ public class BookmarkList extends JList<BookmarkList.Bookmark> {
List<String> array = new ArrayList<>(list);
if (array.size() < 5)
throw new IllegalArgumentException(tr("Wrong number of arguments for bookmark"));
+ icon = ImageProvider.get("dialogs", "bookmark");
name = array.get(0);
area = new Bounds(Double.parseDouble(array.get(1)), Double.parseDouble(array.get(2)),
Double.parseDouble(array.get(3)), Double.parseDouble(array.get(4)));
@@ -56,8 +81,7 @@ public class BookmarkList extends JList<BookmarkList.Bookmark> {
* Constructs a new empty {@code Bookmark}.
*/
public Bookmark() {
- area = null;
- name = null;
+ this(null, null);
}
/**
@@ -65,10 +89,23 @@ public class BookmarkList extends JList<BookmarkList.Bookmark> {
* @param area The bookmark area
*/
public Bookmark(Bounds area) {
+ this(null, area);
+ }
+
+ /**
+ * Constructs a new {@code Bookmark} for the given name and area.
+ * @param name The bookmark name
+ * @param area The bookmark area
+ * @since 12495
+ */
+ protected Bookmark(String name, Bounds area) {
+ this.icon = ImageProvider.get("dialogs", "bookmark");
+ this.name = name;
this.area = area;
}
- @Override public String toString() {
+ @Override
+ public String toString() {
return name;
}
@@ -88,7 +125,7 @@ public class BookmarkList extends JList<BookmarkList.Bookmark> {
if (obj == null || getClass() != obj.getClass()) return false;
Bookmark bookmark = (Bookmark) obj;
return Objects.equals(name, bookmark.name) &&
- Objects.equals(area, bookmark.area);
+ Objects.equals(area, bookmark.area);
}
/**
@@ -122,6 +159,75 @@ public class BookmarkList extends JList<BookmarkList.Bookmark> {
public void setArea(Bounds area) {
this.area = area;
}
+
+ /**
+ * Returns the bookmark icon.
+ * @return the bookmark icon
+ * @since 12495
+ */
+ public ImageIcon getIcon() {
+ return icon;
+ }
+
+ /**
+ * Sets the bookmark icon.
+ * @param icon the bookmark icon
+ * @since 12495
+ */
+ public void setIcon(ImageIcon icon) {
+ this.icon = icon;
+ }
+ }
+
+ /**
+ * A specific optional bookmark for the "home location" configured on osm.org website.
+ * @since 12495
+ */
+ public static class HomeLocationBookmark extends Bookmark {
+ /**
+ * Constructs a new {@code HomeLocationBookmark}.
+ */
+ public HomeLocationBookmark() {
+ setName(tr("Home location"));
+ setIcon(ImageProvider.get("help", "home", ImageSizes.SMALLICON));
+ UserInfo info = JosmUserIdentityManager.getInstance().getUserInfo();
+ if (info == null) {
+ throw new IllegalStateException("User not identified");
+ }
+ LatLon home = info.getHome();
+ if (home == null) {
+ throw new IllegalStateException("User home location not set");
+ }
+ int zoom = info.getHomeZoom();
+ if (zoom <= 3) {
+ // 3 is the default zoom level in OSM database, but the real zoom level was not correct
+ // for a long time, see https://github.com/openstreetmap/openstreetmap-website/issues/1592
+ zoom = 12;
+ }
+ Projection mercator = Projections.getProjectionByCode("EPSG:3857");
+ setArea(MapViewState.createDefaultState(430, 400) // Size of map on osm.org user profile settings
+ .usingProjection(mercator)
+ .usingScale(Selector.GeneralSelector.level2scale(zoom) / 100)
+ .usingCenter(mercator.latlon2eastNorth(home))
+ .getViewArea()
+ .getLatLonBoundsBox());
+ }
+ }
+
+ /**
+ * A specific optional bookmark for the boundaries of recent changesets.
+ * @since 12495
+ */
+ public static class ChangesetBookmark extends Bookmark {
+ /**
+ * Constructs a new {@code ChangesetBookmark}.
+ * @param cs changeset from which the boundaries are read. Its id, name and comment are used to name the bookmark
+ */
+ public ChangesetBookmark(Changeset cs) {
+ setName(String.format("%d - %tF - %s", cs.getId(), cs.getCreatedAt(), cs.getComment()));
+ setIcon(ImageProvider.get("data", "changeset", ImageSizes.SMALLICON));
+ setArea(cs.getBounds());
+ }
}
/**
@@ -135,11 +241,24 @@ public class BookmarkList extends JList<BookmarkList.Bookmark> {
}
/**
- * Loads the bookmarks from file.
+ * Loads the home location bookmark from OSM API,
+ * the manual bookmarks from preferences file,
+ * the changeset bookmarks from changeset cache.
*/
public final void load() {
- DefaultListModel<Bookmark> model = (DefaultListModel<Bookmark>) getModel();
+ final DefaultListModel<Bookmark> model = (DefaultListModel<Bookmark>) getModel();
model.removeAllElements();
+ JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+ // Add home location bookmark first, if user fully identified
+ if (im.isFullyIdentified()) {
+ try {
+ model.addElement(new HomeLocationBookmark());
+ } catch (IllegalStateException e) {
+ Main.info(e.getMessage());
+ Main.trace(e);
+ }
+ }
+ // Then add manual bookmarks previously saved in local preferences
Collection<Collection<String>> args = Main.pref.getArray("bookmarks", null);
if (args != null) {
List<Bookmark> bookmarks = new LinkedList<>();
@@ -155,14 +274,34 @@ public class BookmarkList extends JList<BookmarkList.Bookmark> {
model.addElement(b);
}
}
+ // Finally add recent changeset bookmarks, if user name is known
+ final int n = MAX_CHANGESET_BOOKMARKS.get();
+ if (n > 0 && !im.isAnonymous()) {
+ final UserInfo userInfo = im.getUserInfo();
+ if (userInfo != null) {
+ final ChangesetCacheManager ccm = ChangesetCacheManager.getInstance();
+ final int userId = userInfo.getId();
+ int found = 0;
+ for (int i = 0; i < ccm.getModel().getRowCount() && found < n; i++) {
+ Changeset cs = ccm.getModel().getValueAt(i, 0);
+ if (cs.getUser().getId() == userId && cs.getBounds() != null) {
+ model.addElement(new ChangesetBookmark(cs));
+ found++;
+ }
+ }
+ }
+ }
}
/**
- * Saves all bookmarks to the preferences file
+ * Saves all manual bookmarks to the preferences file.
*/
public final void save() {
List<Collection<String>> coll = new LinkedList<>();
for (Object o : ((DefaultListModel<Bookmark>) getModel()).toArray()) {
+ if (o instanceof HomeLocationBookmark || o instanceof ChangesetBookmark) {
+ continue;
+ }
String[] array = new String[5];
Bookmark b = (Bookmark) o;
array[0] = b.getName();
@@ -176,6 +315,36 @@ public class BookmarkList extends JList<BookmarkList.Bookmark> {
Main.pref.putArray("bookmarks", coll);
}
+ /**
+ * Refreshes the changeset bookmarks.
+ * @since 12495
+ */
+ public void refreshChangesetBookmarks() {
+ final int n = MAX_CHANGESET_BOOKMARKS.get();
+ if (n > 0) {
+ final DefaultListModel<Bookmark> model = (DefaultListModel<Bookmark>) getModel();
+ for (int i = model.getSize() - 1; i >= 0; i--) {
+ if (model.get(i) instanceof ChangesetBookmark) {
+ model.remove(i);
+ }
+ }
+ ChangesetQuery query = ChangesetQuery.forCurrentUser();
+ if (!GraphicsEnvironment.isHeadless()) {
+ final ChangesetQueryTask task = new ChangesetQueryTask(this, query);
+ ChangesetCacheManager.getInstance().runDownloadTask(task);
+ Main.worker.submit(() -> {
+ if (task.isCanceled() || task.isFailed())
+ return;
+ GuiHelper.runInEDT(() -> task.getDownloadedData().stream()
+ .filter(cs -> cs.getBounds() != null)
+ .sorted(Comparator.reverseOrder())
+ .limit(n)
+ .forEachOrdered(cs -> model.addElement(new ChangesetBookmark(cs))));
+ });
+ }
+ }
+ }
+
static class BookmarkCellRenderer extends JLabel implements ListCellRenderer<BookmarkList.Bookmark> {
/**
@@ -183,7 +352,6 @@ public class BookmarkList extends JList<BookmarkList.Bookmark> {
*/
BookmarkCellRenderer() {
setOpaque(true);
- setIcon(ImageProvider.get("dialogs", "bookmark"));
}
protected void renderColor(boolean selected) {
@@ -199,11 +367,13 @@ public class BookmarkList extends JList<BookmarkList.Bookmark> {
protected String buildToolTipText(Bookmark b) {
Bounds area = b.getArea();
StringBuilder sb = new StringBuilder(128);
- sb.append("<html>min[latitude,longitude]=<strong>[")
- .append(area.getMinLat()).append(',').append(area.getMinLon()).append("]</strong>"+
- "<br>max[latitude,longitude]=<strong>[")
- .append(area.getMaxLat()).append(',').append(area.getMaxLon()).append("]</strong>"+
- "</html>");
+ if (area != null) {
+ sb.append("<html>min[latitude,longitude]=<strong>[")
+ .append(area.getMinLat()).append(',').append(area.getMinLon()).append("]</strong>"+
+ "<br>max[latitude,longitude]=<strong>[")
+ .append(area.getMaxLat()).append(',').append(area.getMaxLon()).append("]</strong>"+
+ "</html>");
+ }
return sb.toString();
}
@@ -211,6 +381,7 @@ public class BookmarkList extends JList<BookmarkList.Bookmark> {
public Component getListCellRendererComponent(JList<? extends Bookmark> list, Bookmark value, int index, boolean isSelected,
boolean cellHasFocus) {
renderColor(isSelected);
+ setIcon(value.getIcon());
setText(value.getName());
setToolTipText(buildToolTipText(value));
return this;
diff --git a/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java b/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java
index a44f4a5..746f9b2 100644
--- a/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java
+++ b/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java
@@ -23,6 +23,7 @@ import javax.swing.event.ListSelectionListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.gui.JosmUserIdentityManager;
import org.openstreetmap.josm.gui.download.BookmarkList.Bookmark;
import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.gui.widgets.JosmTextArea;
@@ -69,6 +70,10 @@ public class BookmarkSelection implements DownloadSelection {
bookmarks.addListSelectionListener(renameAction);
pnl.add(new JButton(renameAction), gc);
+ gc.gridy = 2;
+ RefreshAction refreshAction = new RefreshAction();
+ pnl.add(new JButton(refreshAction), gc);
+
gc.fill = GridBagConstraints.BOTH;
gc.weightx = 1.0;
gc.weighty = 1.0;
@@ -277,6 +282,22 @@ public class BookmarkSelection implements DownloadSelection {
}
}
+ class RefreshAction extends AbstractAction {
+ /**
+ * Constructs a new {@code RefreshAction}.
+ */
+ RefreshAction() {
+ putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset", "downloadchangeset"));
+ putValue(SHORT_DESCRIPTION, tr("Download bookmarks for my {0} last changesets", BookmarkList.MAX_CHANGESET_BOOKMARKS.get()));
+ setEnabled(!JosmUserIdentityManager.getInstance().isAnonymous());
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ bookmarks.refreshChangesetBookmarks();
+ }
+ }
+
class DoubleClickAdapter extends MouseAdapter {
@Override
public void mouseClicked(MouseEvent e) {
diff --git a/src/org/openstreetmap/josm/gui/download/DownloadDialog.java b/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
index 60e1a79..a07340c 100644
--- a/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
+++ b/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
@@ -241,7 +241,7 @@ public class DownloadDialog extends JDialog {
getContentPane().add(buildButtonPanel(), BorderLayout.SOUTH);
getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
- KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK), "checkClipboardContents");
+ KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_DOWN_MASK), "checkClipboardContents");
getRootPane().getActionMap().put("checkClipboardContents", new AbstractAction() {
@Override
diff --git a/src/org/openstreetmap/josm/gui/draw/MapViewPath.java b/src/org/openstreetmap/josm/gui/draw/MapViewPath.java
index 9754ea7..f27fc65 100644
--- a/src/org/openstreetmap/josm/gui/draw/MapViewPath.java
+++ b/src/org/openstreetmap/josm/gui/draw/MapViewPath.java
@@ -6,9 +6,11 @@ import java.awt.Shape;
import java.awt.Stroke;
import java.awt.geom.Path2D;
import java.awt.geom.PathIterator;
+import java.util.ArrayList;
import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.coor.ILatLon;
+import org.openstreetmap.josm.data.osm.visitor.paint.OffsetIterator;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.MapViewState;
import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
@@ -253,23 +255,22 @@ public class MapViewPath extends MapPath2D {
for (float f : ((BasicStroke) stroke).getDashArray()) {
length += f;
}
- return visitClippedLine(((BasicStroke) stroke).getDashPhase(), length, consumer);
+ return visitClippedLine(length, consumer);
} else {
- return visitClippedLine(0, 0, consumer);
+ return visitClippedLine(0, consumer);
}
}
/**
* Visits all straight segments of this path. The segments are clamped to the view.
* If they are clamped, the start points are aligned with the pattern.
- * @param strokeOffset The initial offset of the pattern
- * @param strokeLength The dash pattern length. 0 to use no pattern.
+ * @param strokeLength The dash pattern length. 0 to use no pattern. Only segments of this length will be removed from the line.
* @param consumer The consumer to call for each segment
* @return false if visiting the path failed because there e.g. were non-straight segments.
* @since 11147
*/
- public boolean visitClippedLine(double strokeOffset, double strokeLength, PathSegmentConsumer consumer) {
- return new ClampingPathVisitor(state.getViewClipRectangle(), strokeOffset, strokeLength, consumer)
+ public boolean visitClippedLine(double strokeLength, PathSegmentConsumer consumer) {
+ return new ClampingPathVisitor(state.getViewClipRectangle(), strokeLength, consumer)
.visit(this);
}
@@ -283,6 +284,18 @@ public class MapViewPath extends MapPath2D {
}
/**
+ * Create a new {@link MapViewPath} that is the same as the current one except that it is offset in the view.
+ * @param viewOffset The offset in view pixels
+ * @return The new path
+ * @since 12505
+ */
+ public MapViewPath offset(double viewOffset) {
+ OffsetPathVisitor visitor = new OffsetPathVisitor(state, viewOffset);
+ visitor.visit(this);
+ return visitor.getPath();
+ }
+
+ /**
* This class is used to visit the segments of this path.
* @author Michael Zangl
* @since 11147
@@ -399,13 +412,11 @@ public class MapViewPath extends MapPath2D {
/**
* Create a new {@link ClampingPathVisitor}
* @param clip View clip rectangle
- * @param strokeOffset Initial stroke offset
* @param strokeLength Total length of a stroke sequence
* @param consumer The consumer to notify of the path segments.
*/
- ClampingPathVisitor(MapViewRectangle clip, double strokeOffset, double strokeLength, PathSegmentConsumer consumer) {
+ ClampingPathVisitor(MapViewRectangle clip, double strokeLength, PathSegmentConsumer consumer) {
this.clip = clip;
- this.strokeProgress = Math.min(strokeLength - strokeOffset, 0);
this.strokeLength = strokeLength;
this.consumer = consumer;
}
@@ -449,4 +460,41 @@ public class MapViewPath extends MapPath2D {
}
}
+ private class OffsetPathVisitor extends AbstractMapPathVisitor {
+ private final MapViewPath collector;
+ private final ArrayList<MapViewPoint> points = new ArrayList<>();
+ private final double offset;
+
+ OffsetPathVisitor(MapViewState state, double offset) {
+ this.collector = new MapViewPath(state);
+ this.offset = offset;
+ }
+
+ @Override
+ void visitMoveTo(MapViewPoint p) {
+ finishLineSegment();
+ points.add(p);
+ }
+
+ @Override
+ void visitLineTo(MapViewPoint p) {
+ points.add(p);
+ }
+
+ MapViewPath getPath() {
+ finishLineSegment();
+ return collector;
+ }
+
+ private void finishLineSegment() {
+ if (points.size() > 2) {
+ OffsetIterator iterator = new OffsetIterator(points, offset);
+ collector.moveTo(iterator.next());
+ while (iterator.hasNext()) {
+ collector.lineTo(iterator.next());
+ }
+ points.clear();
+ }
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/help/HelpBrowser.java b/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
index 22af7df..ac911b3 100644
--- a/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
+++ b/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
@@ -76,7 +76,7 @@ public class HelpBrowser extends JFrame implements IHelpBrowser {
private final transient HelpContentReader reader;
- private static final JosmAction focusAction = new JosmAction(tr("JOSM Help Browser"), "help", "", null, false, false) {
+ private static final JosmAction FOCUS_ACTION = new JosmAction(tr("JOSM Help Browser"), "help", "", null, false, false) {
@Override
public void actionPerformed(ActionEvent e) {
HelpBrowser.getInstance().setVisible(true);
@@ -220,7 +220,7 @@ public class HelpBrowser extends JFrame implements IHelpBrowser {
windowMenuItem = null;
}
if (windowMenuItem == null && visible) {
- windowMenuItem = MainMenu.add(Main.main.menu.windowMenu, focusAction, MainMenu.WINDOW_MENU_GROUP.VOLATILE);
+ windowMenuItem = MainMenu.add(Main.main.menu.windowMenu, FOCUS_ACTION, MainMenu.WINDOW_MENU_GROUP.VOLATILE);
}
}
super.setVisible(visible);
@@ -576,6 +576,8 @@ public class HelpBrowser extends JFrame implements IHelpBrowser {
HTMLDocument doc = (HTMLDocument) d;
Element element = doc.getElement(id);
try {
+ // Deprecated API to replace only when migrating to Java 9 (replacement not available in Java 8)
+ @SuppressWarnings("deprecation")
Rectangle r = help.modelToView(element.getStartOffset());
if (r != null) {
Rectangle vis = help.getVisibleRect();
diff --git a/src/org/openstreetmap/josm/gui/history/VersionTableModel.java b/src/org/openstreetmap/josm/gui/history/VersionTableModel.java
index 68f838e..e0fc7c7 100644
--- a/src/org/openstreetmap/josm/gui/history/VersionTableModel.java
+++ b/src/org/openstreetmap/josm/gui/history/VersionTableModel.java
@@ -5,6 +5,7 @@ import java.text.DateFormat;
import javax.swing.table.AbstractTableModel;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.data.osm.User;
import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
@@ -80,15 +81,19 @@ public final class VersionTableModel extends AbstractTableModel {
public void setValueAt(Object aValue, int row, int column) {
if (!((Boolean) aValue))
return;
- switch (column) {
- case 1:
- model.setReferencePointInTime(row);
- break;
- case 2:
- model.setCurrentPointInTime(row);
- break;
- default:
- return;
+ try {
+ switch (column) {
+ case 1:
+ model.setReferencePointInTime(row);
+ break;
+ case 2:
+ model.setCurrentPointInTime(row);
+ break;
+ default:
+ return;
+ }
+ } catch (IllegalArgumentException e) {
+ Main.error(e);
}
fireTableDataChanged();
}
diff --git a/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java b/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java
index 9a561ca..eac62c8 100644
--- a/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java
+++ b/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java
@@ -36,6 +36,11 @@ import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Pair;
import org.openstreetmap.josm.tools.date.DateUtils;
+/**
+ * Abstract base class for the task of uploading primitives via OSM API.
+ *
+ * Mainly handles conflicts and certain error situations.
+ */
public abstract class AbstractUploadTask extends PleaseWaitRunnable {
/**
diff --git a/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java b/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java
index bbfb205..820e0b4 100644
--- a/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java
@@ -42,8 +42,8 @@ public class ChangesetCellRenderer extends JLabel implements ListCellRenderer<Ch
sb.append("<strong>").append(tr("Created at:")).append("</strong>").append(
DateUtils.formatDateTime(createdDate, DateFormat.SHORT, DateFormat.SHORT)).append("<br>");
}
- String comment = cs.get("comment");
- if (comment != null) {
+ String comment = cs.getComment();
+ if (!comment.isEmpty()) {
sb.append("<strong>").append(tr("Changeset comment:")).append("</strong>")
.append(Utils.escapeReservedCharactersHTML(comment)).append("<br>");
}
@@ -63,8 +63,8 @@ public class ChangesetCellRenderer extends JLabel implements ListCellRenderer<Ch
if (cs != null) {
setIcon(icon);
StringBuilder sb = new StringBuilder();
- String comment = cs.get("comment");
- if (comment != null) {
+ String comment = cs.getComment();
+ if (!comment.isEmpty()) {
sb.append(cs.getId()).append(" - ").append(comment);
} else if (cs.get("name") != null) {
sb.append(cs.getId()).append(" - ").append(cs.get("name"));
diff --git a/src/org/openstreetmap/josm/gui/io/ConfigurationParameterRequestHandler.java b/src/org/openstreetmap/josm/gui/io/ConfigurationParameterRequestHandler.java
index f390f31..1a77713 100644
--- a/src/org/openstreetmap/josm/gui/io/ConfigurationParameterRequestHandler.java
+++ b/src/org/openstreetmap/josm/gui/io/ConfigurationParameterRequestHandler.java
@@ -1,8 +1,19 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.io;
+/**
+ * Handler, that will take action when the user clicks one of two hyperlinks
+ * in the upload dialog.
+ */
public interface ConfigurationParameterRequestHandler {
+ /**
+ * Handle the event when user clicks the "configure changeset" hyperlink.
+ */
void handleChangesetConfigurationRequest();
+ /**
+ * Handle the event when user clicks the "advanced configuration" hyperlink.
+ * The advanced configuration tab contains upload strategy parameters.
+ */
void handleUploadStrategyConfigurationRequest();
}
diff --git a/src/org/openstreetmap/josm/gui/io/CredentialDialog.java b/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
index d0dbed3..9231a76 100644
--- a/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
@@ -40,6 +40,12 @@ import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.InputMapUtils;
import org.openstreetmap.josm.tools.WindowGeometry;
+/**
+ * Dialog box to request username and password from the user.
+ *
+ * The credentials can be for the OSM API (basic authentication), a different
+ * host or an HTTP proxy.
+ */
public class CredentialDialog extends JDialog {
public static CredentialDialog getOsmApiCredentialDialog(String username, String password, String host,
diff --git a/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java b/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java
index eba4d23..fa25a80 100644
--- a/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java
+++ b/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java
@@ -37,7 +37,7 @@ import org.openstreetmap.josm.tools.GBC;
* by subsequent calls to the renderer (#12462).
*/
class LayerNameAndFilePathTableCell extends JPanel implements TableCellRenderer, TableCellEditor {
- private static final Color colorError = new Color(255, 197, 197);
+ private static final Color COLOR_ERROR = new Color(255, 197, 197);
private static final String ELLIPSIS = '…' + File.separator;
private final JLabel lblLayerName = new JLabel();
@@ -45,7 +45,7 @@ class LayerNameAndFilePathTableCell extends JPanel implements TableCellRenderer,
private final JosmTextField tfFilename = new JosmTextField();
private final JButton btnFileChooser = new JButton(new LaunchFileChooserAction());
- private static final GBC defaultCellStyle = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0);
+ private static final GBC DEFAULT_CELL_STYLE = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0);
private final transient CellEditorSupport cellEditorSupport = new CellEditorSupport(this);
private File value;
@@ -136,7 +136,7 @@ class LayerNameAndFilePathTableCell extends JPanel implements TableCellRenderer,
private String addLblLayerName(SaveLayerInfo info) {
lblLayerName.setIcon(info.getLayer().getIcon());
lblLayerName.setText(info.getName());
- add(lblLayerName, defaultCellStyle);
+ add(lblLayerName, DEFAULT_CELL_STYLE);
return tr("The bold text is the name of the layer.");
}
@@ -163,10 +163,10 @@ class LayerNameAndFilePathTableCell extends JPanel implements TableCellRenderer,
}
}
- lblFilename.setBackground(error ? colorError : getBackground());
- btnFileChooser.setBackground(error ? colorError : getBackground());
+ lblFilename.setBackground(error ? COLOR_ERROR : getBackground());
+ btnFileChooser.setBackground(error ? COLOR_ERROR : getBackground());
- add(lblFilename, defaultCellStyle);
+ add(lblFilename, DEFAULT_CELL_STYLE);
return tr("Click cell to change the file path.") + "<br/>" + tooltip;
}
diff --git a/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java b/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
index 0e88b51..a87d295 100644
--- a/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
@@ -58,6 +58,12 @@ import org.openstreetmap.josm.tools.UserCancelException;
import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.WindowGeometry;
+/**
+ * Dialog that pops up when the user closes a layer with modified data.
+ *
+ * It asks for confirmation that all modification should be discarded and offers
+ * to save the layers to file or upload to server, depending on the type of layer.
+ */
public class SaveLayersDialog extends JDialog implements TableModelListener {
/**
diff --git a/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java b/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java
index e4ac284..bbe6947 100644
--- a/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java
+++ b/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java
@@ -13,6 +13,9 @@ import javax.swing.table.DefaultTableModel;
import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+/**
+ * Table model for the {@link SaveLayersTable} in the {@link SaveLayersDialog}.
+ */
public class SaveLayersModel extends DefaultTableModel {
public static final String MODE_PROP = SaveLayerInfo.class.getName() + ".mode";
diff --git a/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java b/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java
index 71ac724..4c0c3b1 100644
--- a/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java
+++ b/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java
@@ -9,6 +9,9 @@ import javax.swing.JTable;
import org.openstreetmap.josm.gui.io.SaveLayersModel.Mode;
+/**
+ * A table that displays the list of modified layers in the {@link SaveLayersDialog}.
+ */
class SaveLayersTable extends JTable implements PropertyChangeListener {
SaveLayersTable(SaveLayersModel model) {
super(model, new SaveLayersTableColumnModel());
diff --git a/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java b/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java
index 00d80fc..eaa5842 100644
--- a/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java
+++ b/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java
@@ -17,13 +17,16 @@ import javax.swing.table.TableColumn;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.Utils;
+/**
+ * Table column model for the {@link SaveLayersTable} in the {@link SaveLayersDialog}.
+ */
class SaveLayersTableColumnModel extends DefaultTableColumnModel {
/** small renderer class that handles the "should be uploaded/saved" texts. */
private static class RecommendedActionsTableCell implements TableCellRenderer {
private final JPanel pnlEmpty = new JPanel();
private final JLabel needsUpload = new JLabel(tr("should be uploaded"));
private final JLabel needsSave = new JLabel(tr("should be saved"));
- private static final GBC defaultCellStyle = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0);
+ private static final GBC DEFAULT_CELL_STYLE = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0);
/**
* Constructs a new {@code RecommendedActionsTableCell}.
@@ -44,12 +47,12 @@ class SaveLayersTableColumnModel extends DefaultTableColumnModel {
if (info != null) {
String htmlInfoName = Utils.escapeReservedCharactersHTML(info.getName());
if (info.getLayer().requiresUploadToServer() && !info.getLayer().isUploadDiscouraged()) {
- panel.add(needsUpload, defaultCellStyle);
+ panel.add(needsUpload, DEFAULT_CELL_STYLE);
sb.append(tr("Layer ''{0}'' has modifications which should be uploaded to the server.", htmlInfoName));
} else {
if (info.isUploadable()) {
- panel.add(pnlEmpty, defaultCellStyle);
+ panel.add(pnlEmpty, DEFAULT_CELL_STYLE);
}
if (info.getLayer().requiresUploadToServer()) {
sb.append(tr("Layer ''{0}'' has modifications which are discouraged to be uploaded.", htmlInfoName));
@@ -60,12 +63,12 @@ class SaveLayersTableColumnModel extends DefaultTableColumnModel {
sb.append("<br/>");
if (info.getLayer().requiresSaveToFile()) {
- panel.add(needsSave, defaultCellStyle);
+ panel.add(needsSave, DEFAULT_CELL_STYLE);
sb.append(tr("Layer ''{0}'' has modifications which should be saved to its associated file ''{1}''.",
htmlInfoName, info.getFile().toString()));
} else {
if (info.isSavable()) {
- panel.add(pnlEmpty, defaultCellStyle);
+ panel.add(pnlEmpty, DEFAULT_CELL_STYLE);
}
sb.append(tr("Layer ''{0}'' has no modifications to be saved.", htmlInfoName));
}
diff --git a/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java b/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java
index 381d186..066a836 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java
@@ -14,6 +14,9 @@ import javax.swing.JProgressBar;
import org.openstreetmap.josm.gui.io.SaveLayersModel.Mode;
import org.openstreetmap.josm.gui.progress.ProgressRenderer;
+/**
+ * A {@link ProgressRenderer} used for upload/save action in the {@link SaveLayersDialog}.
+ */
class UploadAndSaveProgressRenderer extends JPanel implements ProgressRenderer, PropertyChangeListener {
private final JLabel lblTaskTitle = new JLabel("");
diff --git a/src/org/openstreetmap/josm/gui/io/UploadDialog.java b/src/org/openstreetmap/josm/gui/io/UploadDialog.java
index 7b4eac5..4062b87 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadDialog.java
@@ -11,6 +11,8 @@ import java.awt.FlowLayout;
import java.awt.GraphicsEnvironment;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.beans.PropertyChangeEvent;
@@ -28,12 +30,15 @@ import java.util.Optional;
import java.util.concurrent.TimeUnit;
import javax.swing.AbstractAction;
+import javax.swing.Action;
import javax.swing.BorderFactory;
import javax.swing.Icon;
import javax.swing.JButton;
+import javax.swing.JComponent;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
+import javax.swing.KeyStroke;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.APIDataSet;
@@ -177,6 +182,7 @@ public class UploadDialog extends AbstractUploadDialog implements PropertyChange
pnl.add(btnUpload);
btnUpload.setFocusable(true);
InputMapUtils.enableEnter(btnUpload);
+ bindCtrlEnterToAction(getRootPane(), btnUpload.getAction());
// -- cancel button
CancelAction cancelAction = new CancelAction(this);
@@ -213,7 +219,6 @@ public class UploadDialog extends AbstractUploadDialog implements PropertyChange
pnlBasicUploadSettings.getUploadParameterSummaryPanel()
);
-
// users can click on either of two links in the upload parameter
// summary handler. This installs the handler for these two events.
// We simply select the appropriate tab in the tabbed pane with the configuration dialogs.
@@ -476,7 +481,13 @@ public class UploadDialog extends AbstractUploadDialog implements PropertyChange
return false;
}
- ExtendedDialog dlg = new ExtendedDialog((Component) dialog, title, buttonTexts);
+ ExtendedDialog dlg = new ExtendedDialog((Component) dialog, title, buttonTexts) {
+ @Override
+ public void setupDialog() {
+ super.setupDialog();
+ bindCtrlEnterToAction(getRootPane(), buttons.get(buttons.size() - 1).getAction());
+ }
+ };
dlg.setContent("<html>" + message + "</html>");
dlg.setButtonIcons(buttonIcons);
dlg.setToolTipTexts(tooltips);
@@ -685,4 +696,10 @@ public class UploadDialog extends AbstractUploadDialog implements PropertyChange
public void handleIllegalChunkSize() {
tpConfigPanels.setSelectedIndex(0);
}
+
+ private static void bindCtrlEnterToAction(JComponent component, Action actionToBind) {
+ final KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.CTRL_DOWN_MASK);
+ component.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(stroke, "ctrl_enter");
+ component.getActionMap().put("ctrl_enter", actionToBind);
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java b/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
index 39b8142..25f9846 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
@@ -7,7 +7,6 @@ import static org.openstreetmap.josm.tools.I18n.trn;
import java.awt.BorderLayout;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.util.Optional;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
@@ -51,7 +50,7 @@ public class UploadParameterSummaryPanel extends JPanel implements HyperlinkList
} else {
msg.append(tr("Objects are uploaded to the <strong>open changeset</strong> {0} with upload comment ''{1}''.",
selectedChangeset.getId(),
- Optional.ofNullable(selectedChangeset.get("comment")).orElse("")
+ selectedChangeset.getComment()
));
}
msg.append(' ');
diff --git a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
index cc49f1e..a3c9c2f 100644
--- a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
@@ -992,16 +992,14 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
//cannot paint in parallel
drawImageInside(g, img, anchorImage, anchorScreen, null);
}
- if (tile instanceof ReprojectionTile) {
+ if (tile instanceof ReprojectionTile && ((ReprojectionTile) tile).needsUpdate(Main.map.mapView.getScale())) {
// This means we have a reprojected tile in memory cache, but not at
// current scale. Generally, the positioning of the tile will still
// be correct, but for best image quality, the tile should be
// reprojected to the target scale. The original tile image should
// still be in disk cache, so this is fairly cheap.
- if (((ReprojectionTile) tile).needsUpdate(Main.map.mapView.getScale())) {
- ((ReprojectionTile) tile).invalidate();
- loadTile(tile, false);
- }
+ ((ReprojectionTile) tile).invalidate();
+ loadTile(tile, false);
}
}, missed::add);
diff --git a/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java b/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java
index 572228c..825b1fe 100644
--- a/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java
+++ b/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java
@@ -26,6 +26,12 @@ import org.openstreetmap.josm.gui.layer.Layer.MultiLayerAction;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ImageProvider;
+/**
+ * Action to show a dialog for picking a color.
+ *
+ * By calling this action, the user can choose a color to customize the painting
+ * of a certain {@link GpxLayer} or {@link org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer}.
+ */
public class CustomizeColor extends AbstractAction implements LayerAction, MultiLayerAction {
private final transient List<AbstractProperty<Color>> colors;
diff --git a/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java b/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
index fb3fcf9..778f644 100644
--- a/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
@@ -42,6 +42,11 @@ import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
import org.openstreetmap.josm.tools.Utils;
+/**
+ * Abstract base class for background imagery layers ({@link WMSLayer}, {@link TMSLayer}, {@link WMTSLayer}).
+ *
+ * Handles some common tasks, like image filters, image processors, etc.
+ */
public abstract class ImageryLayer extends Layer {
public static final IntegerProperty PROP_SHARPEN_LEVEL = new IntegerProperty("imagery.sharpen_level", 0);
diff --git a/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java b/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java
index beea6b0..a76aefb 100644
--- a/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java
+++ b/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java
@@ -15,11 +15,29 @@ import org.openstreetmap.josm.tools.MultikeyActionsHandler;
import org.openstreetmap.josm.tools.MultikeyShortcutAction;
import org.openstreetmap.josm.tools.Shortcut;
+/**
+ * Manages actions to jump from one marker to the next for layers that show markers
+ * ({@link org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer},
+ * {@link org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer}).
+ *
+ * Registers global multi-key shortcuts and offers actions for the right-click menu of
+ * the layers.
+ */
public final class JumpToMarkerActions {
+ /**
+ * Interface for a layer that displays markers and supports jumping from
+ * one marker to the next.
+ */
public interface JumpToMarkerLayer {
+ /**
+ * Jump (move the viewport) to the next marker.
+ */
void jumpToNextMarker();
+ /**
+ * Jump (move the viewport) to the previous marker.
+ */
void jumpToPreviousMarker();
}
@@ -30,6 +48,9 @@ public final class JumpToMarkerActions {
private static volatile JumpToNextMarker jumpToNextMarkerAction;
private static volatile JumpToPreviousMarker jumpToPreviousMarkerAction;
+ /**
+ * Initialize the actions, register shortcuts.
+ */
public static void initialize() {
jumpToNextMarkerAction = new JumpToNextMarker(null);
jumpToPreviousMarkerAction = new JumpToPreviousMarker(null);
@@ -37,6 +58,9 @@ public final class JumpToMarkerActions {
MultikeyActionsHandler.getInstance().addAction(jumpToPreviousMarkerAction);
}
+ /**
+ * Unregister the actions.
+ */
public static void unregisterActions() {
MultikeyActionsHandler.getInstance().removeAction(jumpToNextMarkerAction);
MultikeyActionsHandler.getInstance().removeAction(jumpToPreviousMarkerAction);
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
index 682291e..2de738f 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
@@ -28,6 +28,11 @@ import javax.swing.JComponent;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.tools.ExifReader;
+/**
+ * GUI component to display an image (photograph).
+ *
+ * Offers basic mouse interaction (zoom, drag) and on-screen text.
+ */
public class ImageDisplay extends JComponent {
/** The file that is currently displayed */
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
index b7dc8aa..b339dcc 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
@@ -35,6 +35,9 @@ import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.date.DateUtils;
+/**
+ * Dialog to view and manipulate geo-tagged images from a {@link GeoImageLayer}.
+ */
public final class ImageViewerDialog extends ToggleDialog implements LayerChangeListener, ActiveLayerChangeListener {
private static final String COMMAND_ZOOM = "zoom";
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java
index f16b8d5..50fd974 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java
@@ -22,6 +22,11 @@ import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
import org.openstreetmap.josm.data.cache.JCSCacheManager;
import org.openstreetmap.josm.tools.ExifReader;
+/**
+ * Loads thumbnail previews for a list of images from a {@link GeoImageLayer}.
+ *
+ * Thumbnails are loaded in the background and cached on disk for the next session.
+ */
public class ThumbsLoader implements Runnable {
public static final int maxSize = 120;
public static final int minSize = 22;
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/SharpenImageProcessor.java b/src/org/openstreetmap/josm/gui/layer/imagery/SharpenImageProcessor.java
index f2c410a..5d2dd7a 100644
--- a/src/org/openstreetmap/josm/gui/layer/imagery/SharpenImageProcessor.java
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/SharpenImageProcessor.java
@@ -21,19 +21,19 @@ public class SharpenImageProcessor implements ImageProcessor {
private float sharpenLevel = 1;
private ConvolveOp op;
- private static float[] KERNEL_IDENTITY = new float[] {
+ private static final float[] KERNEL_IDENTITY = new float[] {
0, 0, 0,
0, 1, 0,
0, 0, 0
};
- private static float[] KERNEL_BLUR = new float[] {
+ private static final float[] KERNEL_BLUR = new float[] {
1f / 16, 2f / 16, 1f / 16,
2f / 16, 4f / 16, 2f / 16,
1f / 16, 2f / 16, 1f / 16
};
- private static float[] KERNEL_SHARPEN = new float[] {
+ private static final float[] KERNEL_SHARPEN = new float[] {
-.5f, -1f, -.5f,
-1f, 7, -1f,
-.5f, -1f, -.5f
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
index a3b524d..f2c9f28 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
@@ -1033,6 +1033,18 @@ public final class ExpressionFactory {
public static boolean outside(Environment env, String codes) { // NO_UCD (unused code)
return !inside(env, codes);
}
+
+ /**
+ * Determines if the object centroid lies at given lat/lon coordinates.
+ * @param env the environment
+ * @param lat latitude, i.e., the north-south position in degrees
+ * @param lon longitude, i.e., the east-west position in degrees
+ * @return {@code true} if the object centroid lies at given lat/lon coordinates
+ * @since 12514
+ */
+ public static boolean at(Environment env, double lat, double lon) { // NO_UCD (unused code)
+ return new LatLon(lat, lon).equalsEpsilon(center(env));
+ }
}
/**
@@ -1307,9 +1319,14 @@ public final class ExpressionFactory {
public String toString() {
StringBuilder b = new StringBuilder("ParameterFunction~");
b.append(m.getName()).append('(');
- for (int i = 0; i < args.size(); ++i) {
+ for (int i = 0; i < expectedParameterTypes.length; ++i) {
if (i > 0) b.append(',');
- b.append(expectedParameterTypes[i]).append(' ').append(args.get(i));
+ b.append(expectedParameterTypes[i]);
+ if (!needsEnvironment) {
+ b.append(' ').append(args.get(i));
+ } else if (i > 0) {
+ b.append(' ').append(args.get(i-1));
+ }
}
b.append(')');
return b.toString();
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
index 3fe005b..2a0f401 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
@@ -264,11 +264,10 @@ public interface Selector {
@Override
public void visit(Way w) {
- if (e.child == null && left.matches(new Environment(w).withParent(e.osm))) {
- if (e.osm instanceof Way && Geometry.PolygonIntersection.CROSSING.equals(
+ if (e.child == null && left.matches(new Environment(w).withParent(e.osm))
+ && e.osm instanceof Way && Geometry.PolygonIntersection.CROSSING.equals(
Geometry.polygonIntersection(w.getNodes(), ((Way) e.osm).getNodes()))) {
- e.child = w;
- }
+ e.child = w;
}
}
}
@@ -281,25 +280,23 @@ public interface Selector {
@Override
public void visit(Node n) {
- if (e.child == null && left.matches(new Environment(n).withParent(e.osm))) {
- if ((e.osm instanceof Way && Geometry.nodeInsidePolygon(n, ((Way) e.osm).getNodes()))
+ if (e.child == null && left.matches(new Environment(n).withParent(e.osm))
+ && (e.osm instanceof Way && Geometry.nodeInsidePolygon(n, ((Way) e.osm).getNodes()))
|| (e.osm instanceof Relation && (
(Relation) e.osm).isMultipolygon() && Geometry.isNodeInsideMultiPolygon(n, (Relation) e.osm, null))) {
- e.child = n;
- }
+ e.child = n;
}
}
@Override
public void visit(Way w) {
- if (e.child == null && left.matches(new Environment(w).withParent(e.osm))) {
- if ((e.osm instanceof Way && Geometry.PolygonIntersection.FIRST_INSIDE_SECOND.equals(
+ if (e.child == null && left.matches(new Environment(w).withParent(e.osm))
+ && (e.osm instanceof Way && Geometry.PolygonIntersection.FIRST_INSIDE_SECOND.equals(
Geometry.polygonIntersection(w.getNodes(), ((Way) e.osm).getNodes())))
|| (e.osm instanceof Relation && (
(Relation) e.osm).isMultipolygon()
&& Geometry.isPolygonInsideMultiPolygon(w.getNodes(), (Relation) e.osm, null))) {
- e.child = w;
- }
+ e.child = w;
}
}
}
@@ -399,26 +396,24 @@ public interface Selector {
List<Node> wayNodes = ((Way) e.osm).getNodes();
for (int i = 0; i < wayNodes.size(); i++) {
Node n = wayNodes.get(i);
- if (left.matches(e.withPrimitive(n))) {
- if (link.matches(e.withChildAndIndexAndLinkContext(n, i, wayNodes.size()))) {
- e.child = n;
- e.index = i;
- e.count = wayNodes.size();
- return true;
- }
+ if (left.matches(e.withPrimitive(n))
+ && link.matches(e.withChildAndIndexAndLinkContext(n, i, wayNodes.size()))) {
+ e.child = n;
+ e.index = i;
+ e.count = wayNodes.size();
+ return true;
}
}
} else if (e.osm instanceof Relation) {
List<RelationMember> members = ((Relation) e.osm).getMembers();
for (int i = 0; i < members.size(); i++) {
OsmPrimitive member = members.get(i).getMember();
- if (left.matches(e.withPrimitive(member))) {
- if (link.matches(e.withChildAndIndexAndLinkContext(member, i, members.size()))) {
- e.child = member;
- e.index = i;
- e.count = members.size();
- return true;
- }
+ if (left.matches(e.withPrimitive(member))
+ && link.matches(e.withChildAndIndexAndLinkContext(member, i, members.size()))) {
+ e.child = member;
+ e.index = i;
+ e.count = members.size();
+ return true;
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/BoxTextElement.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/BoxTextElement.java
index 47f4661..8bbc14a 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/BoxTextElement.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/BoxTextElement.java
@@ -3,6 +3,7 @@ package org.openstreetmap.josm.gui.mappaint.styleelement;
import java.awt.Color;
import java.awt.Rectangle;
+import java.awt.geom.Point2D;
import java.util.Objects;
import org.openstreetmap.josm.data.osm.Node;
@@ -172,6 +173,14 @@ public class BoxTextElement extends StyleElement {
*/
public TextLabel text;
/**
+ * The x offset of the text.
+ */
+ public int xOffset;
+ /**
+ * The y offset of the text. In screen space (inverted to user space)
+ */
+ public int yOffset;
+ /**
* The {@link HorizontalTextAlignment} for this text.
*/
public HorizontalTextAlignment hAlign;
@@ -186,12 +195,16 @@ public class BoxTextElement extends StyleElement {
* @param c The current cascade
* @param text The text to display
* @param boxProvider The box provider to use
+ * @param offsetX x offset, in screen space
+ * @param offsetY y offset, in screen space
* @param hAlign The {@link HorizontalTextAlignment}
* @param vAlign The {@link VerticalTextAlignment}
*/
public BoxTextElement(Cascade c, TextLabel text, BoxProvider boxProvider,
- HorizontalTextAlignment hAlign, VerticalTextAlignment vAlign) {
+ int offsetX, int offsetY, HorizontalTextAlignment hAlign, VerticalTextAlignment vAlign) {
super(c, 5f);
+ xOffset = offsetX;
+ yOffset = offsetY;
CheckParameterUtil.ensureParameterNotNull(text);
CheckParameterUtil.ensureParameterNotNull(hAlign);
CheckParameterUtil.ensureParameterNotNull(vAlign);
@@ -249,8 +262,9 @@ public class BoxTextElement extends StyleElement {
default:
vAlign = VerticalTextAlignment.BOTTOM;
}
+ Point2D offset = TextLabel.getTextOffset(c);
- return new BoxTextElement(c, text, boxProvider, hAlign, vAlign);
+ return new BoxTextElement(c, text, boxProvider, (int) offset.getX(), (int) -offset.getY(), hAlign, vAlign);
}
/**
@@ -282,18 +296,20 @@ public class BoxTextElement extends StyleElement {
BoxTextElement that = (BoxTextElement) obj;
return hAlign == that.hAlign &&
vAlign == that.vAlign &&
+ xOffset == that.xOffset &&
+ yOffset == that.yOffset &&
Objects.equals(text, that.text) &&
Objects.equals(boxProvider, that.boxProvider);
}
@Override
public int hashCode() {
- return Objects.hash(super.hashCode(), text, boxProvider, hAlign, vAlign);
+ return Objects.hash(super.hashCode(), text, boxProvider, hAlign, vAlign, xOffset, yOffset);
}
@Override
public String toString() {
return "BoxTextElement{" + super.toString() + ' ' + text.toStringImpl()
- + " box=" + getBox() + " hAlign=" + hAlign + " vAlign=" + vAlign + '}';
+ + " box=" + getBox() + " hAlign=" + hAlign + " vAlign=" + vAlign + " xOffset=" + xOffset + " yOffset=" + yOffset + '}';
}
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
index 8e6b243..c0e0e23 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
@@ -136,18 +136,18 @@ public abstract class StyleElement implements StyleKeys {
* FIXME: cached preference values are not updated if the user changes them during
* a JOSM session. Should have a listener listening to preference changes.
*/
- private static volatile String DEFAULT_FONT_NAME;
- private static volatile Float DEFAULT_FONT_SIZE;
+ private static volatile String defaultFontName;
+ private static volatile Float defaultFontSize;
private static final Object lock = new Object();
// thread save access (double-checked locking)
private static Float getDefaultFontSize() {
- Float s = DEFAULT_FONT_SIZE;
+ Float s = defaultFontSize;
if (s == null) {
synchronized (lock) {
- s = DEFAULT_FONT_SIZE;
+ s = defaultFontSize;
if (s == null) {
- DEFAULT_FONT_SIZE = s = (float) Main.pref.getInteger("mappaint.fontsize", 8);
+ defaultFontSize = s = (float) Main.pref.getInteger("mappaint.fontsize", 8);
}
}
}
@@ -155,12 +155,12 @@ public abstract class StyleElement implements StyleKeys {
}
private static String getDefaultFontName() {
- String n = DEFAULT_FONT_NAME;
+ String n = defaultFontName;
if (n == null) {
synchronized (lock) {
- n = DEFAULT_FONT_NAME;
+ n = defaultFontName;
if (n == null) {
- DEFAULT_FONT_NAME = n = Main.pref.get("mappaint.font", "Droid Sans");
+ defaultFontName = n = Main.pref.get("mappaint.font", "Droid Sans");
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextElement.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextElement.java
index ffea73b..7bf44c0 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextElement.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextElement.java
@@ -11,6 +11,7 @@ import org.openstreetmap.josm.gui.mappaint.Cascade;
import org.openstreetmap.josm.gui.mappaint.Environment;
import org.openstreetmap.josm.gui.mappaint.Keyword;
import org.openstreetmap.josm.gui.mappaint.styleelement.placement.CompletelyInsideAreaStrategy;
+import org.openstreetmap.josm.gui.mappaint.styleelement.placement.PositionForAreaStrategy;
/**
* The text that is drawn for a way/area. It may be drawn along the outline or onto the way.
@@ -20,10 +21,30 @@ import org.openstreetmap.josm.gui.mappaint.styleelement.placement.CompletelyInsi
public class TextElement extends StyleElement {
private final TextLabel text;
+ /**
+ * The position strategy for this text label.
+ */
+ private final PositionForAreaStrategy labelPositionStrategy;
- protected TextElement(Cascade c, TextLabel text) {
+ /**
+ * Create a new way/area text element definition
+ * @param c The cascade
+ * @param text The text
+ * @param labelPositionStrategy The position in the area.
+ */
+ protected TextElement(Cascade c, TextLabel text, PositionForAreaStrategy labelPositionStrategy) {
super(c, 4.9f);
- this.text = text;
+ this.text = Objects.requireNonNull(text, "text");
+ this.labelPositionStrategy = Objects.requireNonNull(labelPositionStrategy, "labelPositionStrategy");
+ }
+
+ /**
+ * Gets the strategy that defines where to place the label.
+ * @return The strategy. Never null.
+ * @since 12475
+ */
+ public PositionForAreaStrategy getLabelPositionStrategy() {
+ return labelPositionStrategy;
}
/**
@@ -36,7 +57,12 @@ public class TextElement extends StyleElement {
if (text == null)
return null;
final Cascade c = env.mc.getCascade(env.layer);
- return new TextElement(c, text);
+
+ Keyword positionKeyword = c.get(AreaElement.TEXT_POSITION, null, Keyword.class);
+ PositionForAreaStrategy position = PositionForAreaStrategy.forKeyword(positionKeyword);
+ position = position.withAddedOffset(TextLabel.getTextOffset(c));
+
+ return new TextElement(c, text, position);
}
/**
@@ -57,13 +83,13 @@ public class TextElement extends StyleElement {
if (text == null) {
return null;
}
- return new TextElement(c, text.withPosition(CompletelyInsideAreaStrategy.INSTANCE));
+ return new TextElement(c, text, CompletelyInsideAreaStrategy.INSTANCE);
}
@Override
public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter,
boolean selected, boolean outermember, boolean member) {
- painter.drawText(primitive, text);
+ painter.drawText(primitive, text, getLabelPositionStrategy());
}
@Override
@@ -72,16 +98,17 @@ public class TextElement extends StyleElement {
if (obj == null || getClass() != obj.getClass()) return false;
if (!super.equals(obj)) return false;
TextElement that = (TextElement) obj;
- return Objects.equals(text, that.text);
+ return Objects.equals(labelPositionStrategy, that.labelPositionStrategy)
+ && Objects.equals(text, that.text);
}
@Override
public int hashCode() {
- return Objects.hash(super.hashCode(), text);
+ return Objects.hash(super.hashCode(), text, labelPositionStrategy);
}
@Override
public String toString() {
- return "TextElement{" + super.toString() + "text=" + text + '}';
+ return "TextElement{" + super.toString() + "text=" + text + " labelPositionStrategy=" + labelPositionStrategy + '}';
}
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java
index 189318a..f2ce905 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java
@@ -3,6 +3,7 @@ package org.openstreetmap.josm.gui.mappaint.styleelement;
import java.awt.Color;
import java.awt.Font;
+import java.awt.geom.Point2D;
import java.util.Objects;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -14,7 +15,6 @@ import org.openstreetmap.josm.gui.mappaint.StyleKeys;
import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.DeriveLabelFromNameTagsCompositionStrategy;
import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.StaticLabelCompositionStrategy;
import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.TagLookupCompositionStrategy;
-import org.openstreetmap.josm.gui.mappaint.styleelement.placement.PositionForAreaStrategy;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.Utils;
@@ -38,14 +38,6 @@ public class TextLabel implements StyleKeys {
*/
public Font font;
/**
- * The x offset of the text.
- */
- public int xOffset;
- /**
- * The y offset of the text.
- */
- public int yOffset;
- /**
* The color to draw the text in, includes alpha.
*/
public Color color;
@@ -59,33 +51,22 @@ public class TextLabel implements StyleKeys {
public Color haloColor;
/**
- * The position strategy for this text label.
- */
- private final PositionForAreaStrategy labelPositionStrategy;
-
- /**
* Creates a new text element
*
* @param strategy the strategy indicating how the text is composed for a specific {@link OsmPrimitive} to be rendered.
* If null, no label is rendered.
* @param font the font to be used. Must not be null.
- * @param xOffset x offset
- * @param yOffset y offset
* @param color the color to be used. Must not be null
* @param haloRadius halo radius
* @param haloColor halo color
- * @param labelPositionStrategy The position in the area.
*/
- protected TextLabel(LabelCompositionStrategy strategy, Font font, int xOffset, int yOffset, Color color, Float haloRadius,
- Color haloColor, PositionForAreaStrategy labelPositionStrategy) {
+ protected TextLabel(LabelCompositionStrategy strategy, Font font, Color color, Float haloRadius,
+ Color haloColor) {
this.labelCompositionStrategy = strategy;
this.font = Objects.requireNonNull(font, "font");
- this.xOffset = xOffset;
- this.yOffset = yOffset;
this.color = Objects.requireNonNull(color, "color");
this.haloRadius = haloRadius;
this.haloColor = haloColor;
- this.labelPositionStrategy = Objects.requireNonNull(labelPositionStrategy, "labelPositionStrategy");
}
/**
@@ -96,29 +77,9 @@ public class TextLabel implements StyleKeys {
public TextLabel(TextLabel other) {
this.labelCompositionStrategy = other.labelCompositionStrategy;
this.font = other.font;
- this.xOffset = other.xOffset;
- this.yOffset = other.yOffset;
this.color = other.color;
this.haloColor = other.haloColor;
this.haloRadius = other.haloRadius;
- this.labelPositionStrategy = other.labelPositionStrategy;
- }
-
- /**
- * Copy constructor that changes the position strategy.
- *
- * @param other the other element.
- * @param labelPositionStrategy the position
- */
- private TextLabel(TextLabel other, PositionForAreaStrategy labelPositionStrategy) {
- this.labelCompositionStrategy = other.labelCompositionStrategy;
- this.font = other.font;
- this.xOffset = other.xOffset;
- this.yOffset = other.yOffset;
- this.color = other.color;
- this.haloColor = other.haloColor;
- this.haloRadius = other.haloRadius;
- this.labelPositionStrategy = labelPositionStrategy;
}
/**
@@ -175,20 +136,6 @@ public class TextLabel implements StyleKeys {
if (s == null) return null;
Font font = StyleElement.getFont(c, s);
- float xOffset = 0;
- float yOffset = 0;
- float[] offset = c.get(TEXT_OFFSET, null, float[].class);
- if (offset != null) {
- if (offset.length == 1) {
- yOffset = offset[0];
- } else if (offset.length >= 2) {
- xOffset = offset[0];
- yOffset = offset[1];
- }
- }
- xOffset = c.get(TEXT_OFFSET_X, xOffset, Float.class);
- yOffset = c.get(TEXT_OFFSET_Y, yOffset, Float.class);
-
Color color = c.get(TEXT_COLOR, defaultTextColor, Color.class);
float alpha = c.get(TEXT_OPACITY, 1f, Float.class);
color = Utils.alphaMultiply(color, alpha);
@@ -204,10 +151,29 @@ public class TextLabel implements StyleKeys {
haloColor = Utils.alphaMultiply(haloColor, haloAlphaFactor);
}
- Keyword positionKeyword = c.get(AreaElement.TEXT_POSITION, null, Keyword.class);
- PositionForAreaStrategy position = PositionForAreaStrategy.forKeyword(positionKeyword);
+ return new TextLabel(strategy, font, color, haloRadius, haloColor);
+ }
- return new TextLabel(strategy, font, (int) xOffset, -(int) yOffset, color, haloRadius, haloColor, position);
+ /**
+ * Gets the text-offset property from a cascade
+ * @param c The cascade
+ * @return The text offset property
+ */
+ public static Point2D getTextOffset(Cascade c) {
+ float xOffset = 0;
+ float yOffset = 0;
+ float[] offset = c.get(TEXT_OFFSET, null, float[].class);
+ if (offset != null) {
+ if (offset.length == 1) {
+ yOffset = offset[0];
+ } else if (offset.length >= 2) {
+ xOffset = offset[0];
+ yOffset = offset[1];
+ }
+ }
+ xOffset = c.get(TEXT_OFFSET_X, xOffset, Float.class);
+ yOffset = c.get(TEXT_OFFSET_Y, yOffset, Float.class);
+ return new Point2D.Double(xOffset, yOffset);
}
/**
@@ -222,24 +188,6 @@ public class TextLabel implements StyleKeys {
return labelCompositionStrategy.compose(osm);
}
- /**
- * Gets the strategy that defines where to place the label.
- * @return The strategy. Never null.
- * @since 11722
- */
- public PositionForAreaStrategy getLabelPositionStrategy() {
- return labelPositionStrategy;
- }
-
- /**
- * Creates a new text label with a different position strategy
- * @param labelPositionStrategy The new position strategy to use
- * @return The new label
- */
- public TextLabel withPosition(PositionForAreaStrategy labelPositionStrategy) {
- return new TextLabel(this, labelPositionStrategy);
- }
-
@Override
public String toString() {
return "TextLabel{" + toStringImpl() + '}';
@@ -248,14 +196,8 @@ public class TextLabel implements StyleKeys {
protected String toStringImpl() {
StringBuilder sb = new StringBuilder(96);
sb.append("labelCompositionStrategy=").append(labelCompositionStrategy)
- .append(" font=").append(font);
- if (xOffset != 0) {
- sb.append(" xOffset=").append(xOffset);
- }
- if (yOffset != 0) {
- sb.append(" yOffset=").append(yOffset);
- }
- sb.append(" color=").append(Utils.toString(color));
+ .append(" font=").append(font)
+ .append(" color=").append(Utils.toString(color));
if (haloRadius != null) {
sb.append(" haloRadius=").append(haloRadius)
.append(" haloColor=").append(haloColor);
@@ -265,7 +207,7 @@ public class TextLabel implements StyleKeys {
@Override
public int hashCode() {
- return Objects.hash(labelCompositionStrategy, font, xOffset, yOffset, color, haloRadius, haloColor);
+ return Objects.hash(labelCompositionStrategy, font, color, haloRadius, haloColor);
}
@Override
@@ -273,9 +215,7 @@ public class TextLabel implements StyleKeys {
if (this == obj) return true;
if (obj == null || getClass() != obj.getClass()) return false;
TextLabel textLabel = (TextLabel) obj;
- return xOffset == textLabel.xOffset &&
- yOffset == textLabel.yOffset &&
- Objects.equals(labelCompositionStrategy, textLabel.labelCompositionStrategy) &&
+ return Objects.equals(labelCompositionStrategy, textLabel.labelCompositionStrategy) &&
Objects.equals(font, textLabel.font) &&
Objects.equals(color, textLabel.color) &&
Objects.equals(haloRadius, textLabel.haloRadius) &&
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/CompletelyInsideAreaStrategy.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/CompletelyInsideAreaStrategy.java
index afeca54..a08c032 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/CompletelyInsideAreaStrategy.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/CompletelyInsideAreaStrategy.java
@@ -2,6 +2,7 @@
package org.openstreetmap.josm.gui.mappaint.styleelement.placement;
import java.awt.Rectangle;
+import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import org.openstreetmap.josm.gui.MapViewState;
@@ -19,9 +20,14 @@ public class CompletelyInsideAreaStrategy implements PositionForAreaStrategy {
/**
* An instance of this class.
*/
- public static final CompletelyInsideAreaStrategy INSTANCE = new CompletelyInsideAreaStrategy();
+ public static final CompletelyInsideAreaStrategy INSTANCE = new CompletelyInsideAreaStrategy(0, 0);
- protected CompletelyInsideAreaStrategy() {
+ protected final double offsetX;
+ protected final double offsetY;
+
+ protected CompletelyInsideAreaStrategy(double offsetX, double offsetY) {
+ this.offsetX = offsetX;
+ this.offsetY = offsetY;
}
@Override
@@ -88,13 +94,53 @@ public class CompletelyInsideAreaStrategy implements PositionForAreaStrategy {
return null;
}
- private static MapViewPositionAndRotation centerOf(MapViewState mapViewState, Rectangle centeredNBounds) {
- return new MapViewPositionAndRotation(
- mapViewState.getForView(centeredNBounds.getCenterX(), centeredNBounds.getCenterY()), 0);
+ private MapViewPositionAndRotation centerOf(MapViewState mapViewState, Rectangle centeredNBounds) {
+ double x = centeredNBounds.getCenterX() + offsetX;
+ double y = centeredNBounds.getCenterY() + offsetY;
+ return new MapViewPositionAndRotation(mapViewState.getForView(x, y), 0);
}
@Override
public boolean supportsGlyphVector() {
return false;
}
+
+ @Override
+ public PositionForAreaStrategy withAddedOffset(Point2D addToOffset) {
+ if (Math.abs(addToOffset.getX()) < 1e-5 && Math.abs(addToOffset.getY()) < 1e-5) {
+ return this;
+ } else {
+ return new CompletelyInsideAreaStrategy(offsetX + addToOffset.getX(), offsetY - addToOffset.getY());
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "CompletelyInsideAreaStrategy [offsetX=" + offsetX + ", offsetY=" + offsetY + "]";
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ long temp;
+ temp = Double.doubleToLongBits(offsetX);
+ result = prime * result + (int) (temp ^ (temp >>> 32));
+ temp = Double.doubleToLongBits(offsetY);
+ result = prime * result + (int) (temp ^ (temp >>> 32));
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null || getClass() != obj.getClass()) {
+ return false;
+ }
+ CompletelyInsideAreaStrategy other = (CompletelyInsideAreaStrategy) obj;
+ return Double.doubleToLongBits(offsetX) == Double.doubleToLongBits(other.offsetX)
+ && Double.doubleToLongBits(offsetY) == Double.doubleToLongBits(other.offsetY);
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java
index 0564352..b5d8b50 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java
@@ -3,6 +3,7 @@ package org.openstreetmap.josm.gui.mappaint.styleelement.placement;
import java.awt.font.GlyphVector;
import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import java.util.Collections;
@@ -44,7 +45,11 @@ public class OnLineStrategy implements PositionForAreaStrategy {
public MapViewPositionAndRotation findLabelPlacement(MapViewPath path, Rectangle2D nb) {
return findOptimalWayPosition(nb, path).map(best -> {
MapViewPoint center = best.start.interpolate(best.end, .5);
- return new MapViewPositionAndRotation(center, upsideTheta(best));
+ double theta = upsideTheta(best);
+ MapViewPoint moved = center.getMapViewState().getForView(
+ center.getInViewX() - Math.sin(theta) * yOffset,
+ center.getInViewY() + Math.cos(theta) * yOffset);
+ return new MapViewPositionAndRotation(moved, theta);
}).orElse(null);
}
@@ -331,4 +336,40 @@ public class OnLineStrategy implements PositionForAreaStrategy {
private static double theta(MapViewPoint start, MapViewPoint end) {
return Math.atan2(end.getInViewY() - start.getInViewY(), end.getInViewX() - start.getInViewX());
}
+
+ @Override
+ public PositionForAreaStrategy withAddedOffset(Point2D addToOffset) {
+ if (Math.abs(addToOffset.getY()) < 1e-5) {
+ return this;
+ } else {
+ return new OnLineStrategy(this.yOffset - addToOffset.getY());
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "OnLineStrategy [yOffset=" + yOffset + ']';
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ long temp;
+ temp = Double.doubleToLongBits(yOffset);
+ result = prime * result + (int) (temp ^ (temp >>> 32));
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null || getClass() != obj.getClass()) {
+ return false;
+ }
+ OnLineStrategy other = (OnLineStrategy) obj;
+ return Double.doubleToLongBits(yOffset) == Double.doubleToLongBits(other.yOffset);
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/PartiallyInsideAreaStrategy.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/PartiallyInsideAreaStrategy.java
index 7ce9aae..7550e7c 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/PartiallyInsideAreaStrategy.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/PartiallyInsideAreaStrategy.java
@@ -1,6 +1,7 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.mappaint.styleelement.placement;
+import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import org.openstreetmap.josm.gui.draw.MapViewPath;
@@ -19,9 +20,10 @@ public final class PartiallyInsideAreaStrategy extends CompletelyInsideAreaStrat
/**
* An instance of this class.
*/
- public static final PartiallyInsideAreaStrategy INSTANCE = new PartiallyInsideAreaStrategy();
+ public static final PartiallyInsideAreaStrategy INSTANCE = new PartiallyInsideAreaStrategy(0, 0);
- private PartiallyInsideAreaStrategy() {
+ private PartiallyInsideAreaStrategy(double offsetX, double offsetY) {
+ super(offsetX, offsetY);
}
@Override
@@ -43,4 +45,18 @@ public final class PartiallyInsideAreaStrategy extends CompletelyInsideAreaStrat
return super.findLabelPlacement(path, smallNb);
}
}
+
+ @Override
+ public PositionForAreaStrategy withAddedOffset(Point2D addToOffset) {
+ if (Math.abs(addToOffset.getX()) < 1e-5 && Math.abs(addToOffset.getY()) < 1e-5) {
+ return this;
+ } else {
+ return new PartiallyInsideAreaStrategy(offsetX + addToOffset.getX(), offsetY - addToOffset.getY());
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "PartiallyInsideAreaStrategy [offsetX=" + offsetX + ", offsetY=" + offsetY + "]";
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/PositionForAreaStrategy.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/PositionForAreaStrategy.java
index 03fd9b3..87b9142 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/PositionForAreaStrategy.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/PositionForAreaStrategy.java
@@ -2,6 +2,7 @@
package org.openstreetmap.josm.gui.mappaint.styleelement.placement;
import java.awt.font.GlyphVector;
+import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.util.List;
@@ -78,4 +79,12 @@ public interface PositionForAreaStrategy {
return defaultStrategy;
}
}
+
+ /**
+ * Create a new instance of the same strategy adding a offset
+ * @param addToOffset The offset to add
+ * @return The new strategy
+ * @since 12476
+ */
+ PositionForAreaStrategy withAddedOffset(Point2D addToOffset);
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/DefaultPreferenceSetting.java b/src/org/openstreetmap/josm/gui/preferences/DefaultPreferenceSetting.java
index 163136a..1977a87 100644
--- a/src/org/openstreetmap/josm/gui/preferences/DefaultPreferenceSetting.java
+++ b/src/org/openstreetmap/josm/gui/preferences/DefaultPreferenceSetting.java
@@ -1,14 +1,30 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences;
+/**
+ * Abstract base class for {@link PreferenceSetting} implementations.
+ *
+ * Handles the flag that indicates if a PreferenceSetting is and expert option
+ * or not.
+ */
public abstract class DefaultPreferenceSetting implements PreferenceSetting {
private final boolean isExpert;
+ /**
+ * Constructs a new DefaultPreferenceSetting.
+ *
+ * (Not an expert option by default.)
+ */
public DefaultPreferenceSetting() {
this(false);
}
+ /**
+ * Constructs a new DefaultPreferenceSetting.
+ *
+ * @param isExpert true, if it is an expert option
+ */
public DefaultPreferenceSetting(boolean isExpert) {
this.isExpert = isExpert;
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/DefaultTabPreferenceSetting.java b/src/org/openstreetmap/josm/gui/preferences/DefaultTabPreferenceSetting.java
index 41fa6ae..1522b1f 100644
--- a/src/org/openstreetmap/josm/gui/preferences/DefaultTabPreferenceSetting.java
+++ b/src/org/openstreetmap/josm/gui/preferences/DefaultTabPreferenceSetting.java
@@ -12,6 +12,11 @@ import javax.swing.JTabbedPane;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.tools.GBC;
+/**
+ * Abstract base class for {@link TabPreferenceSetting} implementations.
+ *
+ * Support for common functionality, like icon, title and adding a tab ({@link SubPreferenceSetting}).
+ */
public abstract class DefaultTabPreferenceSetting extends DefaultPreferenceSetting implements TabPreferenceSetting {
private final String iconName;
diff --git a/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java b/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
index f9fcb35..bc7a4ca 100644
--- a/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
+++ b/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
@@ -31,6 +31,13 @@ import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.InputMapUtils;
import org.openstreetmap.josm.tools.WindowGeometry;
+/**
+ * The main preferences dialog.
+ *
+ * Dialog window where the user can change various settings. Organized in main
+ * tabs to the left ({@link TabPreferenceSetting}) and (optional) sub-pages
+ * ({@link SubPreferenceSetting}).
+ */
public class PreferenceDialog extends JDialog {
private final PreferenceTabbedPane tpPreferences = new PreferenceTabbedPane();
diff --git a/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java b/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
index 2677b5d..2aef40c 100644
--- a/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
+++ b/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
@@ -250,8 +250,8 @@ public final class PreferenceTabbedPane extends JTabbedPane implements MouseWhee
// all created tabs
private final transient List<PreferenceTab> tabs = new ArrayList<>();
- private static final Collection<PreferenceSettingFactory> settingsFactories = new LinkedList<>();
- private static final PreferenceSettingFactory advancedPreferenceFactory = new AdvancedPreference.Factory();
+ private static final Collection<PreferenceSettingFactory> SETTINGS_FACTORIES = new LinkedList<>();
+ private static final PreferenceSettingFactory ADVANCED_PREFERENCE_FACTORY = new AdvancedPreference.Factory();
private final transient List<PreferenceSetting> settings = new ArrayList<>();
// distinct list of tabs that have been initialized (we do not initialize tabs until they are displayed to speed up dialog startup)
@@ -438,9 +438,9 @@ public final class PreferenceTabbedPane extends JTabbedPane implements MouseWhee
}
public void buildGui() {
- Collection<PreferenceSettingFactory> factories = new ArrayList<>(settingsFactories);
+ Collection<PreferenceSettingFactory> factories = new ArrayList<>(SETTINGS_FACTORIES);
factories.addAll(PluginHandler.getPreferenceSetting());
- factories.add(advancedPreferenceFactory);
+ factories.add(ADVANCED_PREFERENCE_FACTORY);
for (PreferenceSettingFactory factory : factories) {
if (factory != null) {
@@ -530,29 +530,29 @@ public final class PreferenceTabbedPane extends JTabbedPane implements MouseWhee
static {
// order is important!
- settingsFactories.add(new DisplayPreference.Factory());
- settingsFactories.add(new DrawingPreference.Factory());
- settingsFactories.add(new ColorPreference.Factory());
- settingsFactories.add(new LafPreference.Factory());
- settingsFactories.add(new LanguagePreference.Factory());
- settingsFactories.add(new ServerAccessPreference.Factory());
- settingsFactories.add(new AuthenticationPreference.Factory());
- settingsFactories.add(new ProxyPreference.Factory());
- settingsFactories.add(new OverpassServerPreference.Factory());
- settingsFactories.add(new MapPreference.Factory());
- settingsFactories.add(new ProjectionPreference.Factory());
- settingsFactories.add(new MapPaintPreference.Factory());
- settingsFactories.add(new TaggingPresetPreference.Factory());
- settingsFactories.add(new BackupPreference.Factory());
- settingsFactories.add(new PluginPreference.Factory());
- settingsFactories.add(Main.toolbar);
- settingsFactories.add(new AudioPreference.Factory());
- settingsFactories.add(new ShortcutPreference.Factory());
- settingsFactories.add(new ValidatorPreference.Factory());
- settingsFactories.add(new ValidatorTestsPreference.Factory());
- settingsFactories.add(new ValidatorTagCheckerRulesPreference.Factory());
- settingsFactories.add(new RemoteControlPreference.Factory());
- settingsFactories.add(new ImageryPreference.Factory());
+ SETTINGS_FACTORIES.add(new DisplayPreference.Factory());
+ SETTINGS_FACTORIES.add(new DrawingPreference.Factory());
+ SETTINGS_FACTORIES.add(new ColorPreference.Factory());
+ SETTINGS_FACTORIES.add(new LafPreference.Factory());
+ SETTINGS_FACTORIES.add(new LanguagePreference.Factory());
+ SETTINGS_FACTORIES.add(new ServerAccessPreference.Factory());
+ SETTINGS_FACTORIES.add(new AuthenticationPreference.Factory());
+ SETTINGS_FACTORIES.add(new ProxyPreference.Factory());
+ SETTINGS_FACTORIES.add(new OverpassServerPreference.Factory());
+ SETTINGS_FACTORIES.add(new MapPreference.Factory());
+ SETTINGS_FACTORIES.add(new ProjectionPreference.Factory());
+ SETTINGS_FACTORIES.add(new MapPaintPreference.Factory());
+ SETTINGS_FACTORIES.add(new TaggingPresetPreference.Factory());
+ SETTINGS_FACTORIES.add(new BackupPreference.Factory());
+ SETTINGS_FACTORIES.add(new PluginPreference.Factory());
+ SETTINGS_FACTORIES.add(Main.toolbar);
+ SETTINGS_FACTORIES.add(new AudioPreference.Factory());
+ SETTINGS_FACTORIES.add(new ShortcutPreference.Factory());
+ SETTINGS_FACTORIES.add(new ValidatorPreference.Factory());
+ SETTINGS_FACTORIES.add(new ValidatorTestsPreference.Factory());
+ SETTINGS_FACTORIES.add(new ValidatorTagCheckerRulesPreference.Factory());
+ SETTINGS_FACTORIES.add(new RemoteControlPreference.Factory());
+ SETTINGS_FACTORIES.add(new ImageryPreference.Factory());
}
/**
diff --git a/src/org/openstreetmap/josm/gui/preferences/SourceProvider.java b/src/org/openstreetmap/josm/gui/preferences/SourceProvider.java
index 0c20a77..42b6721 100644
--- a/src/org/openstreetmap/josm/gui/preferences/SourceProvider.java
+++ b/src/org/openstreetmap/josm/gui/preferences/SourceProvider.java
@@ -3,8 +3,17 @@ package org.openstreetmap.josm.gui.preferences;
import java.util.Collection;
+/**
+ * Interface for a class that offers a list of {@link SourceEntry}s.
+ *
+ * Used by plugins to offer additional SourceEntrys to the user.
+ */
@FunctionalInterface
public interface SourceProvider {
+ /**
+ * Get the collection of {@link SourceEntry}s.
+ * @return the collection of {@link SourceEntry}s
+ */
Collection<SourceEntry> getSources();
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryDialog.java b/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryDialog.java
index a7c91ce..597a606 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryDialog.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryDialog.java
@@ -10,7 +10,7 @@ import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.preferences.imagery.AddImageryPanel.ContentValidationListener;
/**
- * Dialog shown to add a new imagery (WMS/TMS) source from imagery preferences.
+ * Dialog shown to add a new imagery (WMS/TMS/WMTS) source from imagery preferences.
* @since 5731
*/
public class AddImageryDialog extends ExtendedDialog implements ContentValidationListener {
@@ -24,7 +24,7 @@ public class AddImageryDialog extends ExtendedDialog implements ContentValidatio
super(parent, tr("Add Imagery URL"), tr("OK"), tr("Cancel"));
setButtonIcons("ok", "cancel");
setCancelButton(2);
- configureContextsensitiveHelp("/Dialog/AddImagery", true /* show help button */);
+ configureContextsensitiveHelp("/Preferences/Imagery", true /* show help button */);
setContent(panel, false);
setMinimumSize(new Dimension(300, 400));
panel.addContentValidationListener(this);
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java b/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java
index 16caeaa..b54b867 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java
@@ -21,6 +21,7 @@ import org.openstreetmap.josm.gui.widgets.JosmTextField;
* An abstract imagery panel used to add WMS/TMS imagery sources. See implementations.
* @see AddTMSLayerPanel
* @see AddWMSLayerPanel
+ * @see AddWMTSLayerPanel
* @since 5617
*/
public abstract class AddImageryPanel extends JPanel {
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java
index 978c2fa..2ec3c9a 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java
@@ -21,7 +21,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
*/
public class LambertProjectionChoice extends ListProjectionChoice {
- private static final String[] lambert4zones = {
+ private static final String[] LAMBERT_4_ZONES = {
tr("{0} ({1} to {2} degrees)", 1, "51.30", "48.15"),
tr("{0} ({1} to {2} degrees)", 2, "48.15", "45.45"),
tr("{0} ({1} to {2} degrees)", 3, "45.45", "42.76"),
@@ -32,7 +32,7 @@ public class LambertProjectionChoice extends ListProjectionChoice {
* Constructs a new {@code LambertProjectionChoice}.
*/
public LambertProjectionChoice() {
- super(tr("Lambert 4 Zones (France)"), /* NO-ICON */ "core:lambert", lambert4zones, tr("Lambert CC Zone"));
+ super(tr("Lambert 4 Zones (France)"), /* NO-ICON */ "core:lambert", LAMBERT_4_ZONES, tr("Lambert CC Zone"));
}
private static class LambertCBPanel extends CBPanel {
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java b/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java
index a6fbe13..781c9cb 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java
@@ -272,7 +272,6 @@ public class ProjectionPreference implements SubPreferenceSetting {
}
private static String projectionChoice;
- private static final Map<String, Collection<String>> projectionChoicesSub = new HashMap<>();
private static final StringProperty PROP_PROJECTION_DEFAULT = new StringProperty("projection.default", mercator.getId());
private static final StringProperty PROP_COORDINATES = new StringProperty("coordinates", null);
@@ -462,13 +461,12 @@ public class ProjectionPreference implements SubPreferenceSetting {
pc = mercator;
}
id = pc.getId();
+ Main.pref.putCollection("projection.sub."+id, pref);
if (makeDefault) {
PROP_PROJECTION_DEFAULT.put(id);
PROP_SUB_PROJECTION_DEFAULT.put(pref);
- Main.pref.putCollection("projection.default.sub."+id, pref);
} else {
projectionChoice = id;
- projectionChoicesSub.put(id, pref);
}
pc.setPreferences(pref);
Projection proj = pc.getProjection();
@@ -502,11 +500,11 @@ public class ProjectionPreference implements SubPreferenceSetting {
* @return the choice class for user selection
*/
private ProjectionChoice setupProjectionCombo() {
- String pcId = projectionChoice != null ? projectionChoice : PROP_PROJECTION_DEFAULT.get();
+ String pcId = getCurrentProjectionChoiceId();
ProjectionChoice pc = null;
for (int i = 0; i < projectionCombo.getItemCount(); ++i) {
ProjectionChoice pc1 = projectionCombo.getItemAt(i);
- pc1.setPreferences(getSubprojectionPreference(pc1));
+ pc1.setPreferences(getSubprojectionPreference(pc1.getId()));
if (pc1.getId().equals(pcId)) {
projectionCombo.setSelectedIndex(i);
selectedProjectionChanged(pc1);
@@ -525,11 +523,23 @@ public class ProjectionPreference implements SubPreferenceSetting {
return pc;
}
- private static Collection<String> getSubprojectionPreference(ProjectionChoice pc) {
- Collection<String> sessionValue = projectionChoicesSub.get(pc.getId());
- if (sessionValue != null)
- return sessionValue;
- return Main.pref.getCollection("projection.default.sub."+pc.getId(), null);
+ /**
+ * Get the id of the projection choice that is currently set.
+ * @return id of the projection choice that is currently set
+ */
+ public static String getCurrentProjectionChoiceId() {
+ return projectionChoice != null ? projectionChoice : PROP_PROJECTION_DEFAULT.get();
+ }
+
+ /**
+ * Get the preferences that have been selected the last time for the given
+ * projection choice.
+ * @param pcId id of the projection choice
+ * @return projection choice parameters that have been selected by the user
+ * the last time; null if user has never selected the given projection choice
+ */
+ public static Collection<String> getSubprojectionPreference(String pcId) {
+ return Main.pref.getCollection("projection.sub."+pcId, null);
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java
index 68a337c..9bb9960 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java
@@ -15,25 +15,25 @@ import org.openstreetmap.josm.Main;
*/
public class UTMFranceDOMProjectionChoice extends ListProjectionChoice {
- private static final String FortMarigotName = tr("Guadeloupe Fort-Marigot 1949");
- private static final String SainteAnneName = tr("Guadeloupe Ste-Anne 1948");
- private static final String MartiniqueName = tr("Martinique Fort Desaix 1952");
- private static final String Reunion92Name = tr("Reunion RGR92");
- private static final String Guyane92Name = tr("Guyane RGFG95");
- private static final String[] utmGeodesicsNames = {FortMarigotName, SainteAnneName, MartiniqueName, Reunion92Name, Guyane92Name};
+ private static final String FORT_MARIGOT_NAME = tr("Guadeloupe Fort-Marigot 1949");
+ private static final String SAINTE_ANNE_NAME = tr("Guadeloupe Ste-Anne 1948");
+ private static final String MARTINIQUE_NAME = tr("Martinique Fort Desaix 1952");
+ private static final String REUNION_92_NAME = tr("Reunion RGR92");
+ private static final String GUYANE_92_NAME = tr("Guyane RGFG95");
+ private static final String[] UTM_GEODESIC_NAMES = {FORT_MARIGOT_NAME, SAINTE_ANNE_NAME, MARTINIQUE_NAME, REUNION_92_NAME, GUYANE_92_NAME};
- private static final Integer FortMarigotEPSG = 2969;
- private static final Integer SainteAnneEPSG = 2970;
- private static final Integer MartiniqueEPSG = 2973;
- private static final Integer ReunionEPSG = 2975;
- private static final Integer GuyaneEPSG = 2972;
- private static final Integer[] utmEPSGs = {FortMarigotEPSG, SainteAnneEPSG, MartiniqueEPSG, ReunionEPSG, GuyaneEPSG };
+ private static final Integer FORT_MARIGOT_EPSG = 2969;
+ private static final Integer SAINTE_ANNE_EPSG = 2970;
+ private static final Integer MARTINIQUE_EPSG = 2973;
+ private static final Integer REUNION_EPSG = 2975;
+ private static final Integer GUYANE_EPSG = 2972;
+ private static final Integer[] UTM_EPSGS = {FORT_MARIGOT_EPSG, SAINTE_ANNE_EPSG, MARTINIQUE_EPSG, REUNION_EPSG, GUYANE_EPSG };
/**
* Constructs a new {@code UTMFranceDOMProjectionChoice}.
*/
public UTMFranceDOMProjectionChoice() {
- super(tr("UTM France (DOM)"), /* NO-ICON */ "core:utmfrancedom", utmGeodesicsNames, tr("UTM Geodesic system"));
+ super(tr("UTM France (DOM)"), /* NO-ICON */ "core:utmfrancedom", UTM_GEODESIC_NAMES, tr("UTM Geodesic system"));
}
@Override
@@ -53,27 +53,27 @@ public class UTMFranceDOMProjectionChoice extends ListProjectionChoice {
@Override
public String getProjectionName() {
- return utmGeodesicsNames[index];
+ return UTM_GEODESIC_NAMES[index];
}
@Override
public String getCurrentCode() {
- return "EPSG:" + utmEPSGs[index];
+ return "EPSG:" + UTM_EPSGS[index];
}
@Override
public String[] allCodes() {
- String[] res = new String[utmEPSGs.length];
- for (int i = 0; i < utmEPSGs.length; ++i) {
- res[i] = "EPSG:" + utmEPSGs[i];
+ String[] res = new String[UTM_EPSGS.length];
+ for (int i = 0; i < UTM_EPSGS.length; ++i) {
+ res[i] = "EPSG:" + UTM_EPSGS[i];
}
return res;
}
@Override
public Collection<String> getPreferencesFromCode(String code) {
- for (int i = 0; i < utmEPSGs.length; i++) {
- if (("EPSG:" + utmEPSGs[i]).equals(code))
+ for (int i = 0; i < UTM_EPSGS.length; i++) {
+ if (("EPSG:" + UTM_EPSGS[i]).equals(code))
return Collections.singleton(Integer.toString(i+1));
}
return null;
diff --git a/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java b/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
index 33e4155..24e4a2f 100644
--- a/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
@@ -64,13 +64,13 @@ public class PrefJPanel extends JPanel {
// on the physical keyboard. What language pack is installed in JOSM is completely
// independent from the keyboard's labelling. But the operation system's locale
// usually matches the keyboard. This even works with my English Windows and my German keyboard.
- private static final String SHIFT = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A,
+ private static final String SHIFT = KeyEvent.getModifiersExText(KeyStroke.getKeyStroke(KeyEvent.VK_A,
KeyEvent.SHIFT_DOWN_MASK).getModifiers());
- private static final String CTRL = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A,
+ private static final String CTRL = KeyEvent.getModifiersExText(KeyStroke.getKeyStroke(KeyEvent.VK_A,
KeyEvent.CTRL_DOWN_MASK).getModifiers());
- private static final String ALT = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A,
+ private static final String ALT = KeyEvent.getModifiersExText(KeyStroke.getKeyStroke(KeyEvent.VK_A,
KeyEvent.ALT_DOWN_MASK).getModifiers());
- private static final String META = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A,
+ private static final String META = KeyEvent.getModifiersExText(KeyStroke.getKeyStroke(KeyEvent.VK_A,
KeyEvent.META_DOWN_MASK).getModifiers());
// A list of keys to present the user. Sadly this really is a list of keys Java knows about,
@@ -100,7 +100,8 @@ public class PrefJPanel extends JPanel {
String unknown = Toolkit.getProperty("AWT.unknown", "Unknown");
// Assume all known keys are declared in KeyEvent as "public static int VK_*"
for (Field field : KeyEvent.class.getFields()) {
- if (field.getName().startsWith("VK_")) {
+ // Ignore VK_KP_DOWN, UP, etc. because they have the same name as VK_DOWN, UP, etc. See #8340
+ if (field.getName().startsWith("VK_") && !field.getName().startsWith("VK_KP_")) {
try {
int i = field.getInt(null);
String s = KeyEvent.getKeyText(i);
diff --git a/src/org/openstreetmap/josm/gui/tagging/TagTable.java b/src/org/openstreetmap/josm/gui/tagging/TagTable.java
index b9f99e6..3aa487b 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TagTable.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TagTable.java
@@ -353,7 +353,7 @@ public class TagTable extends JosmTable implements EndEditListener {
//
addAction = new AddAction();
getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
- .put(KeyStroke.getKeyStroke(KeyEvent.VK_ADD, KeyEvent.CTRL_MASK), "addTag");
+ .put(KeyStroke.getKeyStroke(KeyEvent.VK_ADD, KeyEvent.CTRL_DOWN_MASK), "addTag");
getActionMap().put("addTag", addAction);
pasteAction = new PasteAction();
diff --git a/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java b/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java
index 55a3a73..3fd3779 100644
--- a/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java
+++ b/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java
@@ -19,6 +19,7 @@ import javax.swing.SwingUtilities;
import javax.swing.Timer;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.ListenerList;
/**
* Helper object that allows cross-platform detection of key press and release events
@@ -34,8 +35,14 @@ public class AdvancedKeyPressDetector implements AWTEventListener {
private Timer timer;
private final List<KeyPressReleaseListener> keyListeners = new CopyOnWriteArrayList<>();
+ /** @deprecated replaced by {@link #modifierExListeners} */
+ @Deprecated
private final List<ModifierListener> modifierListeners = new CopyOnWriteArrayList<>();
+ private final ListenerList<ModifierExListener> modifierExListeners = ListenerList.create();
+ /** @deprecated replaced by {@link #previousModifiersEx} */
+ @Deprecated
private int previousModifiers;
+ private int previousModifiersEx;
private boolean enabled = true;
@@ -50,12 +57,23 @@ public class AdvancedKeyPressDetector implements AWTEventListener {
/**
* Adds an object that wants to receive key modifier changed events.
* @param l listener to add
+ * @deprecated use {@link #addModifierExListener} instead
*/
+ @Deprecated
public void addModifierListener(ModifierListener l) {
modifierListeners.add(l);
}
/**
+ * Adds an object that wants to receive extended key modifier changed events.
+ * @param l listener to add
+ * @since 12517
+ */
+ public void addModifierExListener(ModifierExListener l) {
+ modifierExListeners.addListener(l);
+ }
+
+ /**
* Removes the listener.
* @param l listener to remove
*/
@@ -66,12 +84,23 @@ public class AdvancedKeyPressDetector implements AWTEventListener {
/**
* Removes the key modifier listener.
* @param l listener to remove
+ * @deprecated use {@link #removeModifierExListener} instead
*/
+ @Deprecated
public void removeModifierListener(ModifierListener l) {
modifierListeners.remove(l);
}
/**
+ * Removes the extended key modifier listener.
+ * @param l listener to remove
+ * @since 12517
+ */
+ public void removeModifierExListener(ModifierExListener l) {
+ modifierExListeners.removeListener(l);
+ }
+
+ /**
* Register this object as AWTEventListener
*/
public void register() {
@@ -105,6 +134,9 @@ public class AdvancedKeyPressDetector implements AWTEventListener {
if (!modifierListeners.isEmpty()) {
Main.warn(tr("Some of the key modifier listeners forgot to remove themselves: {0}"), modifierListeners.toString());
}
+ if (modifierExListeners.hasListeners()) {
+ Main.warn(tr("Some of the key modifier listeners forgot to remove themselves: {0}"), modifierExListeners.toString());
+ }
try {
Toolkit.getDefaultToolkit().removeAWTEventListener(this);
} catch (SecurityException ex) {
@@ -146,6 +178,7 @@ public class AdvancedKeyPressDetector implements AWTEventListener {
}
@Override
+ @SuppressWarnings("deprecation")
public void eventDispatched(AWTEvent e) {
if (!(e instanceof KeyEvent)) {
return;
@@ -161,6 +194,13 @@ public class AdvancedKeyPressDetector implements AWTEventListener {
}
}
+ // check if ctrl, alt, shift extended modifiers are changed
+ int modifEx = ke.getModifiersEx();
+ if (previousModifiersEx != modifEx) {
+ previousModifiersEx = modifEx;
+ modifierExListeners.fireEvent(m -> m.modifiersExChanged(modifEx));
+ }
+
processKeyEvent(ke);
}
diff --git a/src/org/openstreetmap/josm/gui/util/FileFilterAllFiles.java b/src/org/openstreetmap/josm/gui/util/FileFilterAllFiles.java
index b083d9d..fb068a5 100644
--- a/src/org/openstreetmap/josm/gui/util/FileFilterAllFiles.java
+++ b/src/org/openstreetmap/josm/gui/util/FileFilterAllFiles.java
@@ -13,17 +13,17 @@ import javax.swing.filechooser.FileFilter;
*/
public class FileFilterAllFiles extends FileFilter {
- private static FileFilterAllFiles INSTANCE;
+ private static FileFilterAllFiles instance;
/**
* Replies the unique instance.
* @return the unique instance
*/
public static synchronized FileFilterAllFiles getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new FileFilterAllFiles();
+ if (instance == null) {
+ instance = new FileFilterAllFiles();
}
- return INSTANCE;
+ return instance;
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/util/ModifierExListener.java b/src/org/openstreetmap/josm/gui/util/ModifierExListener.java
new file mode 100644
index 0000000..08f53ee
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/util/ModifierExListener.java
@@ -0,0 +1,15 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.util;
+
+/**
+ * Listener called when pressed extended modifier keys change is detected.
+ * @since 12517
+ */
+ at FunctionalInterface
+public interface ModifierExListener {
+ /**
+ * Called when the extended modifiers are changed
+ * @param modifiers The new extended modifiers
+ */
+ void modifiersExChanged(int modifiers);
+}
diff --git a/src/org/openstreetmap/josm/gui/util/ModifierListener.java b/src/org/openstreetmap/josm/gui/util/ModifierListener.java
index 56202b3..0f5bfa6 100644
--- a/src/org/openstreetmap/josm/gui/util/ModifierListener.java
+++ b/src/org/openstreetmap/josm/gui/util/ModifierListener.java
@@ -5,7 +5,9 @@ package org.openstreetmap.josm.gui.util;
* Listener called when pressed modifier keys change is detected
* @since 7217
* @since 10600 (functional interface)
+ * @deprecated use ModifierExListener instead
*/
+ at Deprecated
@FunctionalInterface
public interface ModifierListener {
/**
diff --git a/src/org/openstreetmap/josm/io/ChangesetQuery.java b/src/org/openstreetmap/josm/io/ChangesetQuery.java
index dfcda3a..da54a34 100644
--- a/src/org/openstreetmap/josm/io/ChangesetQuery.java
+++ b/src/org/openstreetmap/josm/io/ChangesetQuery.java
@@ -18,10 +18,17 @@ import java.util.stream.Stream;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.JosmUserIdentityManager;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.date.DateUtils;
+/**
+ * Data class to collect restrictions (parameters) for downloading changesets from the
+ * OSM API.
+ * <p>
+ * @see <a href="https://wiki.openstreetmap.org/wiki/API_v0.6#Query:_GET_.2Fapi.2F0.6.2Fchangesets">OSM API 0.6 call "/changesets?"</a>
+ */
public class ChangesetQuery {
/**
@@ -57,6 +64,25 @@ public class ChangesetQuery {
}
/**
+ * Replies a changeset query object restricted to the current user, if known.
+ * @return a changeset query object restricted to the current user, if known
+ * @throws IllegalStateException if current user is anonymous
+ * @since 12495
+ */
+ public static ChangesetQuery forCurrentUser() {
+ JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+ if (im.isAnonymous()) {
+ throw new IllegalStateException("anonymous user");
+ }
+ ChangesetQuery query = new ChangesetQuery();
+ if (im.isFullyIdentified()) {
+ return query.forUser(im.getUserId());
+ } else {
+ return query.forUser(im.getUserName());
+ }
+ }
+
+ /**
* Restricts the query to changesets owned by the user with id <code>uid</code>.
*
* @param uid the uid of the user. > 0 expected.
diff --git a/src/org/openstreetmap/josm/io/DefaultProxySelector.java b/src/org/openstreetmap/josm/io/DefaultProxySelector.java
index 1fc3fad..4e4e373 100644
--- a/src/org/openstreetmap/josm/io/DefaultProxySelector.java
+++ b/src/org/openstreetmap/josm/io/DefaultProxySelector.java
@@ -40,11 +40,11 @@ public class DefaultProxySelector extends ProxySelector {
*
* We therefore read the property at class loading time and remember it's value.
*/
- private static boolean JVM_WILL_USE_SYSTEM_PROXIES;
+ private static boolean jvmWillUseSystemProxies;
static {
String v = System.getProperty("java.net.useSystemProxies");
if (v != null && v.equals(Boolean.TRUE.toString())) {
- JVM_WILL_USE_SYSTEM_PROXIES = true;
+ jvmWillUseSystemProxies = true;
}
}
@@ -58,7 +58,7 @@ public class DefaultProxySelector extends ProxySelector {
*
*/
public static boolean willJvmRetrieveSystemProxies() {
- return JVM_WILL_USE_SYSTEM_PROXIES;
+ return jvmWillUseSystemProxies;
}
private ProxyPolicy proxyPolicy;
@@ -201,7 +201,7 @@ public class DefaultProxySelector extends ProxySelector {
}
switch(proxyPolicy) {
case USE_SYSTEM_SETTINGS:
- if (!JVM_WILL_USE_SYSTEM_PROXIES) {
+ if (!jvmWillUseSystemProxies) {
Main.warn(tr("The JVM is not configured to lookup proxies from the system settings. "+
"The property ''java.net.useSystemProxies'' was missing at startup time. Will not use a proxy."));
return NO_PROXY_LIST;
diff --git a/src/org/openstreetmap/josm/io/DiffResultProcessor.java b/src/org/openstreetmap/josm/io/DiffResultProcessor.java
index c463836..bf66875 100644
--- a/src/org/openstreetmap/josm/io/DiffResultProcessor.java
+++ b/src/org/openstreetmap/josm/io/DiffResultProcessor.java
@@ -33,6 +33,15 @@ import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
+/**
+ * Helper class to process the OSM API server response to a "diff" upload.
+ * <p>
+ * New primitives (uploaded with negative id) will be assigned a positive id, etc.
+ * The goal is to have a clean state, just like a fresh download (assuming no
+ * concurrent uploads by other users have happened in the meantime).
+ * <p>
+ * @see <a href="https://wiki.openstreetmap.org/wiki/API_v0.6#Response_10">API 0.6 diff upload response</a>
+ */
public class DiffResultProcessor {
private static class DiffResultEntry {
diff --git a/src/org/openstreetmap/josm/io/FileExporter.java b/src/org/openstreetmap/josm/io/FileExporter.java
index fd8e09d..8b965c1 100644
--- a/src/org/openstreetmap/josm/io/FileExporter.java
+++ b/src/org/openstreetmap/josm/io/FileExporter.java
@@ -11,6 +11,9 @@ import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
+/**
+ * Abstract base class for file exporters - IO classes that save layers to a file.
+ */
public abstract class FileExporter implements ActiveLayerChangeListener {
public final ExtensionFileFilter filter;
@@ -27,10 +30,25 @@ public abstract class FileExporter implements ActiveLayerChangeListener {
this.enabled = true;
}
+ /**
+ * Check if this exporter can export a certain layer to a certain file.
+ *
+ * Most exporters support just a single layer type.
+ * @param pathname the target file name (check file extension using the {@link #filter}
+ * @param layer the layer requested for export
+ * @return true, if the exporter can handle the layer and filename is okay
+ */
public boolean acceptFile(File pathname, Layer layer) {
return filter.acceptName(pathname.getName());
}
+ /**
+ * Execute the data export. (To be overridden by subclasses.)
+ *
+ * @param file target file
+ * @param layer the layer to export
+ * @throws IOException in case of an IO error
+ */
public void exportData(File file, Layer layer) throws IOException {
throw new IOException(tr("Could not export ''{0}''.", file.getName()));
}
diff --git a/src/org/openstreetmap/josm/io/GeoJSONWriter.java b/src/org/openstreetmap/josm/io/GeoJSONWriter.java
index 21845d9..c44dea9 100644
--- a/src/org/openstreetmap/josm/io/GeoJSONWriter.java
+++ b/src/org/openstreetmap/josm/io/GeoJSONWriter.java
@@ -44,7 +44,7 @@ public class GeoJSONWriter {
private final OsmDataLayer layer;
private final Projection projection;
- private static final boolean skipEmptyNodes = true;
+ private static final boolean SKIP_EMPTY_NODES = true;
/**
* Constructs a new {@code GeoJSONWriter}.
@@ -164,7 +164,7 @@ public class GeoJSONWriter {
protected void appendPrimitive(OsmPrimitive p, JsonArrayBuilder array) {
if (p.isIncomplete()) {
return;
- } else if (skipEmptyNodes && p instanceof Node && p.getKeys().isEmpty()) {
+ } else if (SKIP_EMPTY_NODES && p instanceof Node && p.getKeys().isEmpty()) {
return;
}
diff --git a/src/org/openstreetmap/josm/io/MissingOAuthAccessTokenException.java b/src/org/openstreetmap/josm/io/MissingOAuthAccessTokenException.java
index 40fe7cb..44466f3 100644
--- a/src/org/openstreetmap/josm/io/MissingOAuthAccessTokenException.java
+++ b/src/org/openstreetmap/josm/io/MissingOAuthAccessTokenException.java
@@ -1,6 +1,9 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io;
+/**
+ * Exception thrown when a valid OAuth access token was expected, but not found.
+ */
public class MissingOAuthAccessTokenException extends OsmTransferException {
/**
@@ -11,7 +14,7 @@ public class MissingOAuthAccessTokenException extends OsmTransferException {
}
/**
- * Constructs a new {@code OsmTransferException} with the specified detail message and cause.
+ * Constructs a new {@code MissingOAuthAccessTokenException} with the specified detail message and cause.
* @param message The detail message (which is saved for later retrieval by the {@link #getMessage} method)
* @param cause The cause (which is saved for later retrieval by the {@link #getCause} method).
* A null value is permitted, and indicates that the cause is nonexistent or unknown.
@@ -21,7 +24,7 @@ public class MissingOAuthAccessTokenException extends OsmTransferException {
}
/**
- * Constructs a new {@code OsmTransferException} with the specified detail message.
+ * Constructs a new {@code MissingOAuthAccessTokenException} with the specified detail message.
* @param message The detail message (which is saved for later retrieval by the {@link #getMessage} method)
*/
public MissingOAuthAccessTokenException(String message) {
@@ -29,7 +32,7 @@ public class MissingOAuthAccessTokenException extends OsmTransferException {
}
/**
- * Constructs a new {@code OsmTransferException} with the specified cause.
+ * Constructs a new {@code MissingOAuthAccessTokenException} with the specified cause.
* @param cause The cause (which is saved for later retrieval by the {@link #getCause} method).
* A null value is permitted, and indicates that the cause is nonexistent or unknown.
*/
diff --git a/src/org/openstreetmap/josm/io/OsmChangeImporter.java b/src/org/openstreetmap/josm/io/OsmChangeImporter.java
index 0fdc66e..9f76437 100644
--- a/src/org/openstreetmap/josm/io/OsmChangeImporter.java
+++ b/src/org/openstreetmap/josm/io/OsmChangeImporter.java
@@ -17,6 +17,10 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.gui.util.GuiHelper;
+/**
+ * File importer that reads OSM change files (*.osc).
+ * @see <a href="http://wiki.openstreetmap.org/wiki/OsmChange">OsmChange</a>
+ */
public class OsmChangeImporter extends FileImporter {
public static final ExtensionFileFilter FILE_FILTER = ExtensionFileFilter.newFilterWithArchiveExtensions(
diff --git a/src/org/openstreetmap/josm/io/OsmChangesetParser.java b/src/org/openstreetmap/josm/io/OsmChangesetParser.java
index 4ead551..7bb4572 100644
--- a/src/org/openstreetmap/josm/io/OsmChangesetParser.java
+++ b/src/org/openstreetmap/josm/io/OsmChangesetParser.java
@@ -152,7 +152,7 @@ public final class OsmChangesetParser {
} catch (NumberFormatException e) {
throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "max_lat", maxLatStr));
}
- current.setMax(new LatLon(maxLon, maxLat));
+ current.setMax(new LatLon(maxLat, maxLon));
}
// -- comments_count
diff --git a/src/org/openstreetmap/josm/io/OsmConnection.java b/src/org/openstreetmap/josm/io/OsmConnection.java
index 289ab0a..7c953b4 100644
--- a/src/org/openstreetmap/josm/io/OsmConnection.java
+++ b/src/org/openstreetmap/josm/io/OsmConnection.java
@@ -84,7 +84,7 @@ public class OsmConnection {
*
* @param connection the connection
*
- * @throws OsmTransferException if there is currently no OAuth Access Token configured
+ * @throws MissingOAuthAccessTokenException if there is currently no OAuth Access Token configured
* @throws OsmTransferException if signing fails
*/
protected void addOAuthAuthorizationHeader(HttpClient connection) throws OsmTransferException {
diff --git a/src/org/openstreetmap/josm/io/OsmImporter.java b/src/org/openstreetmap/josm/io/OsmImporter.java
index fabb6bc..a6dc3eb 100644
--- a/src/org/openstreetmap/josm/io/OsmImporter.java
+++ b/src/org/openstreetmap/josm/io/OsmImporter.java
@@ -18,6 +18,10 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.gui.util.GuiHelper;
+/**
+ * File importer that reads *.osm data files. (main storage format for OSM data
+ * in JOSM)
+ */
public class OsmImporter extends FileImporter {
/**
diff --git a/src/org/openstreetmap/josm/io/OsmServerReadPostprocessor.java b/src/org/openstreetmap/josm/io/OsmServerReadPostprocessor.java
index aaa7a12..ffe1c3f 100644
--- a/src/org/openstreetmap/josm/io/OsmServerReadPostprocessor.java
+++ b/src/org/openstreetmap/josm/io/OsmServerReadPostprocessor.java
@@ -4,8 +4,17 @@ package org.openstreetmap.josm.io;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+/**
+ * Interface for plugins to process osm data after it has been downloaded or read
+ * from file.
+ * @see OsmReader#registerPostprocessor(OsmServerReadPostprocessor)
+ */
@FunctionalInterface
public interface OsmServerReadPostprocessor {
-
+ /**
+ * Execute the post processor.
+ * @param ds the dataset to read or modify
+ * @param progress the progress monitor
+ */
void postprocessDataSet(DataSet ds, ProgressMonitor progress);
}
diff --git a/src/org/openstreetmap/josm/io/OsmServerReader.java b/src/org/openstreetmap/josm/io/OsmServerReader.java
index d41dc93..12e5d07 100644
--- a/src/org/openstreetmap/josm/io/OsmServerReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerReader.java
@@ -10,6 +10,8 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.List;
+import javax.xml.parsers.ParserConfigurationException;
+
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.gpx.GpxData;
import org.openstreetmap.josm.data.notes.Note;
@@ -18,6 +20,11 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.io.auth.CredentialsAgentException;
import org.openstreetmap.josm.io.auth.CredentialsManager;
import org.openstreetmap.josm.tools.HttpClient;
+import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.XmlParsingException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
/**
* This DataReader reads directly from the REST API of the osm server.
@@ -359,4 +366,60 @@ public abstract class OsmServerReader extends OsmConnection {
public List<Note> parseRawNotesBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
return null;
}
+
+ /**
+ * Returns an attribute from the given DOM node.
+ * @param node DOM node
+ * @param name attribute name
+ * @return attribute value for the given attribute
+ * @since 12510
+ */
+ protected static String getAttribute(Node node, String name) {
+ return node.getAttributes().getNamedItem(name).getNodeValue();
+ }
+
+ /**
+ * DOM document parser.
+ * @param <R> resulting type
+ * @since 12510
+ */
+ @FunctionalInterface
+ protected interface DomParser<R> {
+ /**
+ * Parses a given DOM document.
+ * @param doc DOM document
+ * @return parsed data
+ * @throws XmlParsingException if an XML parsing error occurs
+ */
+ R parse(Document doc) throws XmlParsingException;
+ }
+
+ /**
+ * Fetches generic data from the DOM document resulting an API call.
+ * @param api the OSM API call
+ * @param subtask the subtask translated message
+ * @param parser the parser converting the DOM document (OSM API result)
+ * @param <T> data type
+ * @param monitor The progress monitor
+ * @param reason The reason to show on console. Can be {@code null} if no reason is given
+ * @return The converted data
+ * @throws OsmTransferException if something goes wrong
+ * @since 12510
+ */
+ public <T> T fetchData(String api, String subtask, DomParser<T> parser, ProgressMonitor monitor, String reason)
+ throws OsmTransferException {
+ try {
+ monitor.beginTask("");
+ monitor.indeterminateSubTask(subtask);
+ try (InputStream in = getInputStream(api, monitor.createSubTaskMonitor(1, true), reason)) {
+ return parser.parse(Utils.parseSafeDOM(in));
+ }
+ } catch (OsmTransferException e) {
+ throw e;
+ } catch (IOException | ParserConfigurationException | SAXException e) {
+ throw new OsmTransferException(e);
+ } finally {
+ monitor.finishTask();
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java b/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java
index 5e6f663..b2c7c8d 100644
--- a/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java
@@ -3,12 +3,9 @@ package org.openstreetmap.josm.io;
import static org.openstreetmap.josm.tools.I18n.tr;
-import java.io.IOException;
-import java.io.InputStream;
import java.util.LinkedList;
import java.util.List;
-import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathException;
@@ -18,20 +15,18 @@ import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.UserInfo;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.XmlParsingException;
import org.openstreetmap.josm.tools.date.DateUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
+/**
+ * Download and parse info of the logged in user (OSM API v0.6 "/user/details").
+ * @see <a href="https://wiki.openstreetmap.org/wiki/API_v0.6#Details_of_the_logged-in_user">/user/details</a>
+ */
public class OsmServerUserInfoReader extends OsmServerReader {
- protected static String getAttribute(Node node, String name) {
- return node.getAttributes().getNamedItem(name).getNodeValue();
- }
-
/**
* Parses the given XML data and returns the associated user info.
* @param document The XML contents
@@ -170,18 +165,7 @@ public class OsmServerUserInfoReader extends OsmServerReader {
* @since 6695
*/
public UserInfo fetchUserInfo(ProgressMonitor monitor, String reason) throws OsmTransferException {
- try {
- monitor.beginTask("");
- monitor.indeterminateSubTask(tr("Reading user info ..."));
- try (InputStream in = getInputStream("user/details", monitor.createSubTaskMonitor(1, true), reason)) {
- return buildFromXML(Utils.parseSafeDOM(in));
- }
- } catch (OsmTransferException e) {
- throw e;
- } catch (IOException | ParserConfigurationException | SAXException e) {
- throw new OsmTransferException(e);
- } finally {
- monitor.finishTask();
- }
+ return fetchData("user/details", tr("Reading user info ..."),
+ OsmServerUserInfoReader::buildFromXML, monitor, reason);
}
}
diff --git a/src/org/openstreetmap/josm/io/OsmServerUserPreferencesReader.java b/src/org/openstreetmap/josm/io/OsmServerUserPreferencesReader.java
new file mode 100644
index 0000000..77c7e79
--- /dev/null
+++ b/src/org/openstreetmap/josm/io/OsmServerUserPreferencesReader.java
@@ -0,0 +1,94 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathException;
+import javax.xml.xpath.XPathFactory;
+
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.XmlParsingException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * Download and parse preferences of the logged in user (OSM API v0.6 "/user/preferences").
+ * @see <a href="https://wiki.openstreetmap.org/wiki/API_v0.6#Preferences_of_the_logged-in_user">/user/preferences</a>
+ * @since 12502
+ */
+public class OsmServerUserPreferencesReader extends OsmServerReader {
+
+ /**
+ * Parses the given XML data and returns the associated user preferences.
+ * @param document The XML contents
+ * @return The user preferences
+ * @throws XmlParsingException if parsing goes wrong
+ */
+ public static Map<String, String> buildFromXML(Document document) throws XmlParsingException {
+ try {
+ XPath xpath = XPathFactory.newInstance().newXPath();
+ Map<String, String> result = new HashMap<>();
+
+ // -- preferences
+ NodeList xmlNodeList = (NodeList) xpath.compile("/osm/preferences/preference").evaluate(document, XPathConstants.NODESET);
+ if (xmlNodeList != null) {
+ for (int i = 0; i < xmlNodeList.getLength(); i++) {
+ Node xmlNode = xmlNodeList.item(i);
+ String k = getAttribute(xmlNode, "k");
+ if (k == null)
+ throw new XmlParsingException(tr("Missing attribute ''{0}'' on XML tag ''{1}''.", "k", "preference"));
+ String v = getAttribute(xmlNode, "v");
+ if (v == null)
+ throw new XmlParsingException(tr("Missing attribute ''{0}'' on XML tag ''{1}''.", "v", "preference"));
+ result.put(k, v);
+ }
+ }
+
+ return result;
+ } catch (XPathException e) {
+ throw new XmlParsingException(e);
+ }
+ }
+
+ /**
+ * Constructs a new {@code OsmServerUserInfoReader}.
+ */
+ public OsmServerUserPreferencesReader() {
+ setDoAuthenticate(true);
+ }
+
+ @Override
+ public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {
+ // not implemented
+ return null;
+ }
+
+ /**
+ * Fetches user preferences, without explicit reason.
+ * @param monitor The progress monitor
+ * @return The user preferences
+ * @throws OsmTransferException if something goes wrong
+ */
+ public Map<String, String> fetchUserPreferences(ProgressMonitor monitor) throws OsmTransferException {
+ return fetchUserPreferences(monitor, null);
+ }
+
+ /**
+ * Fetches user info, with an explicit reason.
+ * @param monitor The progress monitor
+ * @param reason The reason to show on console. Can be {@code null} if no reason is given
+ * @return The user info
+ * @throws OsmTransferException if something goes wrong
+ */
+ public Map<String, String> fetchUserPreferences(ProgressMonitor monitor, String reason) throws OsmTransferException {
+ return fetchData("user/preferences", tr("Reading user preferences ..."),
+ OsmServerUserPreferencesReader::buildFromXML, monitor, reason);
+ }
+}
diff --git a/src/org/openstreetmap/josm/io/OsmServerWritePostprocessor.java b/src/org/openstreetmap/josm/io/OsmServerWritePostprocessor.java
index 1917e1c..b9f2c09 100644
--- a/src/org/openstreetmap/josm/io/OsmServerWritePostprocessor.java
+++ b/src/org/openstreetmap/josm/io/OsmServerWritePostprocessor.java
@@ -6,6 +6,11 @@ import java.util.Collection;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+/**
+ * Interface for plugins to process osm data after it has been uploaded to the
+ * OSM server.
+ * @see OsmServerWriter#registerPostprocessor(OsmServerWritePostprocessor)
+ */
@FunctionalInterface
public interface OsmServerWritePostprocessor {
diff --git a/src/org/openstreetmap/josm/io/StreamProgressUpdater.java b/src/org/openstreetmap/josm/io/StreamProgressUpdater.java
index e8a13a2..7a1e2a5 100644
--- a/src/org/openstreetmap/josm/io/StreamProgressUpdater.java
+++ b/src/org/openstreetmap/josm/io/StreamProgressUpdater.java
@@ -8,6 +8,10 @@ import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.tools.Utils;
+/**
+ * Helper class for {@link StreamProgressUpdater} to encapsulate interaction with
+ * the {@link ProgressMonitor}.
+ */
final class StreamProgressUpdater {
private final long size;
diff --git a/src/org/openstreetmap/josm/io/XmlWriter.java b/src/org/openstreetmap/josm/io/XmlWriter.java
index d63eb61..edee0c6 100644
--- a/src/org/openstreetmap/josm/io/XmlWriter.java
+++ b/src/org/openstreetmap/josm/io/XmlWriter.java
@@ -61,7 +61,7 @@ public class XmlWriter implements Closeable {
for (int i = 0; i < unencoded.length(); ++i) {
String encS = null;
if (!keepApos || unencoded.charAt(i) != '\'') {
- encS = XmlWriter.encoding.get(unencoded.charAt(i));
+ encS = ENCODING.get(unencoded.charAt(i));
}
if (encS != null) {
if (buffer == null) {
@@ -79,16 +79,16 @@ public class XmlWriter implements Closeable {
/**
* The output writer to save the values to.
*/
- private static final Map<Character, String> encoding = new HashMap<>();
+ private static final Map<Character, String> ENCODING = new HashMap<>();
static {
- encoding.put('<', "<");
- encoding.put('>', ">");
- encoding.put('"', """);
- encoding.put('\'', "'");
- encoding.put('&', "&");
- encoding.put('\n', "
");
- encoding.put('\r', "
");
- encoding.put('\t', "	");
+ ENCODING.put('<', "<");
+ ENCODING.put('>', ">");
+ ENCODING.put('"', """);
+ ENCODING.put('\'', "'");
+ ENCODING.put('&', "&");
+ ENCODING.put('\n', "
");
+ ENCODING.put('\r', "
");
+ ENCODING.put('\t', "	");
}
@Override
diff --git a/src/org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java b/src/org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java
index a07e8d3..013fea2 100644
--- a/src/org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java
+++ b/src/org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java
@@ -55,7 +55,7 @@ class JavaFxMediaPlayer implements SoundPlayer {
}
@Override
- public void play(Execute command, State stateChange, URL playingUrl) throws AudioException, IOException {
+ public synchronized void play(Execute command, State stateChange, URL playingUrl) throws AudioException, IOException {
try {
final URL url = command.url();
if (playingUrl != url) {
@@ -85,7 +85,7 @@ class JavaFxMediaPlayer implements SoundPlayer {
}
@Override
- public void pause(Execute command, State stateChange, URL playingUrl) throws AudioException, IOException {
+ public synchronized void pause(Execute command, State stateChange, URL playingUrl) throws AudioException, IOException {
if (mediaPlayer != null) {
try {
mediaPlayer.pause();
@@ -102,13 +102,13 @@ class JavaFxMediaPlayer implements SoundPlayer {
}
@Override
- public double position() {
- return mediaPlayer.getCurrentTime().toSeconds();
+ public synchronized double position() {
+ return mediaPlayer != null ? mediaPlayer.getCurrentTime().toSeconds() : -1;
}
@Override
- public double speed() {
- return mediaPlayer.getCurrentRate();
+ public synchronized double speed() {
+ return mediaPlayer != null ? mediaPlayer.getCurrentRate() : -1;
}
@Override
diff --git a/src/org/openstreetmap/josm/io/imagery/WMSImagery.java b/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
index db1a805..0168b38 100644
--- a/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
+++ b/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
@@ -172,10 +172,21 @@ public class WMSImagery {
return a.toString();
}
+ /**
+ * Returns the URL for the "GetMap" WMS request in JPEG format.
+ * @param selectedLayers the list of selected layers, matching the "LAYERS" WMS request argument
+ * @return the URL for the "GetMap" WMS request
+ */
public String buildGetMapUrl(Collection<LayerDetails> selectedLayers) {
return buildGetMapUrl(selectedLayers, "image/jpeg");
}
+ /**
+ * Returns the URL for the "GetMap" WMS request.
+ * @param selectedLayers the list of selected layers, matching the "LAYERS" WMS request argument
+ * @param format the requested image format, matching the "FORMAT" WMS request argument
+ * @return the URL for the "GetMap" WMS request
+ */
public String buildGetMapUrl(Collection<LayerDetails> selectedLayers, String format) {
return buildRootUrl() + "FORMAT=" + format + (imageFormatHasTransparency(format) ? "&TRANSPARENT=TRUE" : "")
+ "&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS="
@@ -183,6 +194,12 @@ public class WMSImagery {
+ "&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}";
}
+ /**
+ * Attempts WMS "GetCapabilities" request and initializes internal variables if successful.
+ * @param serviceUrlStr WMS service URL
+ * @throws IOException if any I/O errors occurs
+ * @throws WMSGetCapabilitiesException if the WMS server replies a ServiceException
+ */
public void attemptGetCapabilities(String serviceUrlStr) throws IOException, WMSGetCapabilitiesException {
URL getCapabilitiesUrl = null;
try {
@@ -287,6 +304,12 @@ public class WMSImagery {
|| format.startsWith("image/svg") || format.startsWith("image/tiff"));
}
+ /**
+ * Returns a new {@code ImageryInfo} describing the given service name and selected WMS layers.
+ * @param name service name
+ * @param selectedLayers selected WMS layers
+ * @return a new {@code ImageryInfo} describing the given service name and selected WMS layers
+ */
public ImageryInfo toImageryInfo(String name, Collection<LayerDetails> selectedLayers) {
ImageryInfo i = new ImageryInfo(name, buildGetMapUrl(selectedLayers));
if (selectedLayers != null) {
@@ -344,10 +367,10 @@ public class WMSImagery {
// If that's not available, try LatLonBoundingBox
bboxElem = getChild(element, "LatLonBoundingBox");
if (bboxElem != null) {
- double left = Double.parseDouble(bboxElem.getAttribute("minx"));
- double top = Double.parseDouble(bboxElem.getAttribute("maxy"));
- double right = Double.parseDouble(bboxElem.getAttribute("maxx"));
- double bot = Double.parseDouble(bboxElem.getAttribute("miny"));
+ double left = getDecimalDegree(bboxElem, "minx");
+ double top = getDecimalDegree(bboxElem, "maxy");
+ double right = getDecimalDegree(bboxElem, "maxx");
+ double bot = getDecimalDegree(bboxElem, "miny");
bounds = new Bounds(bot, left, top, right);
}
}
@@ -358,6 +381,11 @@ public class WMSImagery {
return new LayerDetails(name, ident, crsList, josmSupportsThisLayer, bounds, childLayers);
}
+ private static double getDecimalDegree(Element elem, String attr) {
+ // Some real-world WMS servers use a comma instead of a dot as decimal separator (seen in Polish WMS server)
+ return Double.parseDouble(elem.getAttribute(attr).replace(',', '.'));
+ }
+
private static boolean isProjSupported(String crs) {
return Projections.getProjectionByCode(crs) != null;
}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java b/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
index ae1329c..362775a 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
@@ -215,7 +215,7 @@ public class AddTagsDialog extends ExtendedDialog {
TableHelper.adjustColumnWidth(propertyTable, 3, 300);
// get edit results if the table looses the focus, for example if a user clicks "add tags"
propertyTable.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
- propertyTable.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.SHIFT_MASK), "shiftenter");
+ propertyTable.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.SHIFT_DOWN_MASK), "shiftenter");
propertyTable.getActionMap().put("shiftenter", new AbstractAction() {
@Override public void actionPerformed(ActionEvent e) {
buttonAction(1, e); // add all tags on Shift-Enter
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/DNSNameFix.java b/src/org/openstreetmap/josm/io/remotecontrol/DNSNameFix.java
deleted file mode 100644
index cc765fc..0000000
--- a/src/org/openstreetmap/josm/io/remotecontrol/DNSNameFix.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.openstreetmap.josm.io.remotecontrol;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-
-import org.openstreetmap.josm.tools.Utils;
-
-/**
- * This class implements the DNSName as required by the GeneralNames
- * ASN.1 object.
- * <p>
- * [RFC2459] When the subjectAltName extension contains a domain name service
- * label, the domain name MUST be stored in the dNSName (an IA5String).
- * The name MUST be in the "preferred name syntax," as specified by RFC
- * 1034 [RFC 1034]. Note that while upper and lower case letters are
- * allowed in domain names, no signifigance is attached to the case. In
- * addition, while the string " " is a legal domain name, subjectAltName
- * extensions with a dNSName " " are not permitted. Finally, the use of
- * the DNS representation for Internet mail addresses (wpolk.nist.gov
- * instead of wpolk at nist.gov) is not permitted; such identities are to
- * be encoded as rfc822Name.
- *
- * This class has been copied from OpenJDK8u repository and modified
- * in order to fix Java bug 8016345:
- * https://bugs.openjdk.java.net/browse/JDK-8016345
- *
- * It can be deleted after a migration to a Java release fixing this bug:
- * https://bugs.openjdk.java.net/browse/JDK-8054380
- * <p>
- * @author Amit Kapoor
- * @author Hemma Prafullchandra
- * @author JOSM developers
- * @since 7347
- */
-public final class DNSNameFix extends sun.security.x509.DNSName {
-
- private static final String alpha = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
- private static final String digitsAndHyphen = "0123456789-";
- private static final String alphaDigitsAndHyphen = alpha + digitsAndHyphen;
-
- /**
- * Create the DNSName object with the specified name.
- *
- * @param name the DNSName.
- * @throws IOException if the name is not a valid DNSName subjectAltName
- */
- public DNSNameFix(String name) throws IOException {
- super("fake");
- if (name == null || name.isEmpty())
- throw new IOException("DNS name must not be null");
- if (name.indexOf(' ') != -1)
- throw new IOException("DNS names or NameConstraints with blank components are not permitted");
- if (name.charAt(0) == '.' || name.charAt(name.length() -1) == '.')
- throw new IOException("DNS names or NameConstraints may not begin or end with a .");
- //Name will consist of label components separated by "."
- //startIndex is the index of the first character of a component
- //endIndex is the index of the last character of a component plus 1
- for (int endIndex, startIndex = 0; startIndex < name.length(); startIndex = endIndex+1) {
- endIndex = name.indexOf('.', startIndex);
- if (endIndex < 0) {
- endIndex = name.length();
- }
- if ((endIndex-startIndex) < 1)
- throw new IOException("DNSName SubjectAltNames with empty components are not permitted");
-
- //nonStartIndex: index for characters in the component beyond the first one
- for (int nonStartIndex = startIndex+1; nonStartIndex < endIndex; nonStartIndex++) {
- char x = name.charAt(nonStartIndex);
- if ((alphaDigitsAndHyphen).indexOf(x) < 0)
- throw new IOException("DNSName components must consist of letters, digits, and hyphens");
- }
- }
- try {
- Field fName = getClass().getSuperclass().getDeclaredField("name");
- Utils.setObjectsAccessible(fName);
- fName.set(this, name);
- } catch (ReflectiveOperationException | SecurityException e) {
- throw new IOException(e);
- }
- }
-}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
index 89e44b8..d387f50 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
@@ -50,6 +50,7 @@ import sun.security.x509.CertificateSerialNumber;
import sun.security.x509.CertificateValidity;
import sun.security.x509.CertificateVersion;
import sun.security.x509.CertificateX509Key;
+import sun.security.x509.DNSName;
import sun.security.x509.ExtendedKeyUsageExtension;
import sun.security.x509.GeneralName;
import sun.security.x509.GeneralNameInterface;
@@ -108,21 +109,19 @@ public class RemoteControlHttpsServer extends Thread {
public static final String ENTRY_ALIAS = "josm_localhost";
/**
- * Creates a GeneralName object from known types.
+ * Creates a GeneralNameInterface object from known types.
* @param t one of 4 known types
* @param v value
* @return which one
* @throws IOException if any I/O error occurs
*/
- private static GeneralName createGeneralName(String t, String v) throws IOException {
- GeneralNameInterface gn;
+ private static GeneralNameInterface createGeneralNameInterface(String t, String v) throws IOException {
switch (t.toLowerCase(Locale.ENGLISH)) {
- case "uri": gn = new URIName(v); break;
- case "dns": gn = new DNSNameFix(v); break;
- case "ip": gn = new IPAddressName(v); break;
- default: gn = new OIDName(v);
+ case "uri": return new URIName(v);
+ case "dns": return new DNSName(v);
+ case "ip": return new IPAddressName(v);
+ default: return new OIDName(v);
}
- return new GeneralName(gn);
}
/**
@@ -173,7 +172,7 @@ public class RemoteControlHttpsServer extends Thread {
}
String t = item.substring(0, colonpos);
String v = item.substring(colonpos+1);
- gnames.add(createGeneralName(t, v));
+ gnames.add(new GeneralName(createGeneralNameInterface(t, v)));
}
// Non critical
ext.set(SubjectAlternativeNameExtension.NAME, new SubjectAlternativeNameExtension(Boolean.FALSE, gnames));
@@ -219,11 +218,7 @@ public class RemoteControlHttpsServer extends Thread {
KeyPair pair = generator.generateKeyPair();
X509Certificate cert = generateCertificate("CN=localhost, OU=JOSM, O=OpenStreetMap", pair, 1825, "SHA256withRSA",
- // see #10033#comment:20: All browsers respect "ip" in SAN, except IE which only understands DNS entries:
- // CHECKSTYLE.OFF: LineLength
- // https://connect.microsoft.com/IE/feedback/details/814744/the-ie-doesnt-trust-a-san-certificate-when-connecting-to-ip-address
- // CHECKSTYLE.ON: LineLength
- "dns:localhost,ip:127.0.0.1,dns:127.0.0.1,ip:::1,uri:https://127.0.0.1:"+HTTPS_PORT+",uri:https://::1:"+HTTPS_PORT);
+ "dns:localhost,ip:127.0.0.1,ip:::1,uri:https://127.0.0.1:"+HTTPS_PORT+",uri:https://::1:"+HTTPS_PORT);
KeyStore ks = KeyStore.getInstance("JKS");
ks.load(null, null);
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
index ac0d50d..e8ccd69 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
@@ -279,10 +279,12 @@ public class LoadAndZoomHandler extends RequestHandler {
if (args != null && args.containsKey("select")) {
toSelect.clear();
for (String item : args.get("select").split(",")) {
- try {
- toSelect.add(SimplePrimitiveId.fromString(item));
- } catch (IllegalArgumentException ex) {
- Main.warn(ex, "RemoteControl: invalid selection '" + item + "' ignored");
+ if (!item.isEmpty()) {
+ try {
+ toSelect.add(SimplePrimitiveId.fromString(item));
+ } catch (IllegalArgumentException ex) {
+ Main.warn(ex, "RemoteControl: invalid selection '" + item + "' ignored");
+ }
}
}
}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java
index 39d433c..defdfb9 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java
@@ -97,10 +97,12 @@ public class LoadObjectHandler extends RequestHandler {
protected void validateRequest() throws RequestHandlerBadRequestException {
ps.clear();
for (String i : (args != null ? args.get("objects") : "").split(",\\s*")) {
- try {
- ps.add(SimplePrimitiveId.fromString(i));
- } catch (IllegalArgumentException e) {
- Main.warn(e, "RemoteControl: invalid selection '"+i+"' ignored.");
+ if (!i.isEmpty()) {
+ try {
+ ps.add(SimplePrimitiveId.fromString(i));
+ } catch (IllegalArgumentException e) {
+ Main.warn(e, "RemoteControl: invalid selection '"+i+"' ignored.");
+ }
}
}
}
diff --git a/src/org/openstreetmap/josm/io/session/SessionReader.java b/src/org/openstreetmap/josm/io/session/SessionReader.java
index c823618..c032cd5 100644
--- a/src/org/openstreetmap/josm/io/session/SessionReader.java
+++ b/src/org/openstreetmap/josm/io/session/SessionReader.java
@@ -15,6 +15,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
@@ -35,13 +36,13 @@ import org.openstreetmap.josm.data.ViewportData;
import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.projection.Projection;
-import org.openstreetmap.josm.data.projection.Projections;
import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.io.Compression;
import org.openstreetmap.josm.io.IllegalDataException;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.MultiMap;
import org.openstreetmap.josm.tools.Utils;
@@ -57,6 +58,94 @@ import org.xml.sax.SAXException;
*/
public class SessionReader {
+ /**
+ * Data class for projection saved in the session file.
+ */
+ public static class SessionProjectionChoiceData {
+ private final String projectionChoiceId;
+ private final Collection<String> subPreferences;
+
+ /**
+ * Construct a new SessionProjectionChoiceData.
+ * @param projectionChoiceId projection choice id
+ * @param subPreferences parameters for the projection choice
+ */
+ public SessionProjectionChoiceData(String projectionChoiceId, Collection<String> subPreferences) {
+ this.projectionChoiceId = projectionChoiceId;
+ this.subPreferences = subPreferences;
+ }
+
+ /**
+ * Get the projection choice id.
+ * @return the projection choice id
+ */
+ public String getProjectionChoiceId() {
+ return projectionChoiceId;
+ }
+
+ /**
+ * Get the parameters for the projection choice
+ * @return parameters for the projection choice
+ */
+ public Collection<String> getSubPreferences() {
+ return subPreferences;
+ }
+ }
+
+ /**
+ * Data class for viewport saved in the session file.
+ */
+ public static class SessionViewportData {
+ private final LatLon center;
+ private final double meterPerPixel;
+
+ /**
+ * Construct a new SessionViewportData.
+ * @param center the lat/lon coordinates of the screen center
+ * @param meterPerPixel scale in meters per pixel
+ */
+ public SessionViewportData(LatLon center, double meterPerPixel) {
+ CheckParameterUtil.ensureParameterNotNull(center);
+ this.center = center;
+ this.meterPerPixel = meterPerPixel;
+ }
+
+ /**
+ * Get the lat/lon coordinates of the screen center.
+ * @return lat/lon coordinates of the screen center
+ */
+ public LatLon getCenter() {
+ return center;
+ }
+
+ /**
+ * Get the scale in meters per pixel.
+ * @return scale in meters per pixel
+ */
+ public double getScale() {
+ return meterPerPixel;
+ }
+
+ /**
+ * Convert this viewport data to a {@link ViewportData} object (with projected coordinates).
+ * @param proj the projection to convert from lat/lon to east/north
+ * @return the corresponding ViewportData object
+ */
+ public ViewportData getEastNorthViewport(Projection proj) {
+ EastNorth centerEN = proj.latlon2eastNorth(center);
+ // Get a "typical" distance in east/north units that
+ // corresponds to a couple of pixels. Shouldn't be too
+ // large, to keep it within projection bounds and
+ // not too small to avoid rounding errors.
+ double dist = 0.01 * proj.getDefaultZoomInPPD();
+ LatLon ll1 = proj.eastNorth2latlon(new EastNorth(centerEN.east() - dist, centerEN.north()));
+ LatLon ll2 = proj.eastNorth2latlon(new EastNorth(centerEN.east() + dist, centerEN.north()));
+ double meterPerEasting = ll1.greatCircleDistance(ll2) / dist / 2;
+ double scale = meterPerPixel / meterPerEasting; // unit: easting per pixel
+ return new ViewportData(centerEN, scale);
+ }
+ }
+
private static final Map<String, Class<? extends SessionLayerImporter>> sessionLayerImporters = new HashMap<>();
private URI sessionFileURI;
@@ -65,7 +154,8 @@ public class SessionReader {
private List<Layer> layers = new ArrayList<>();
private int active = -1;
private final List<Runnable> postLoadTasks = new ArrayList<>();
- private ViewportData viewport;
+ private SessionViewportData viewport;
+ private SessionProjectionChoiceData projectionChoice;
static {
registerSessionLayerImporter("osm-data", OsmDataSessionImporter.class);
@@ -129,13 +219,21 @@ public class SessionReader {
/**
* Return the viewport (map position and scale).
- * @return The viewport. Can be null when no viewport info is found in the file.
+ * @return the viewport; can be null when no viewport info is found in the file
*/
- public ViewportData getViewport() {
+ public SessionViewportData getViewport() {
return viewport;
}
/**
+ * Return the projection choice data.
+ * @return the projection; can be null when no projection info is found in the file
+ */
+ public SessionProjectionChoiceData getProjectionChoice() {
+ return projectionChoice;
+ }
+
+ /**
* A class that provides some context for the individual {@link SessionLayerImporter}
* when doing the import.
*/
@@ -338,41 +436,8 @@ public class SessionReader {
error(tr("Version ''{0}'' of session file is not supported. Expected: 0.1", version));
}
- Element viewportEl = getElementByTagName(root, "viewport");
- if (viewportEl != null) {
- EastNorth center = null;
- Element centerEl = getElementByTagName(viewportEl, "center");
- if (centerEl != null && centerEl.hasAttribute("lat") && centerEl.hasAttribute("lon")) {
- try {
- LatLon centerLL = new LatLon(Double.parseDouble(centerEl.getAttribute("lat")),
- Double.parseDouble(centerEl.getAttribute("lon")));
- center = Projections.project(centerLL);
- } catch (NumberFormatException ex) {
- Main.warn(ex);
- }
- }
- if (center != null) {
- Element scaleEl = getElementByTagName(viewportEl, "scale");
- if (scaleEl != null && scaleEl.hasAttribute("meter-per-pixel")) {
- try {
- double meterPerPixel = Double.parseDouble(scaleEl.getAttribute("meter-per-pixel"));
- Projection proj = Main.getProjection();
- // Get a "typical" distance in east/north units that
- // corresponds to a couple of pixels. Shouldn't be too
- // large, to keep it within projection bounds and
- // not too small to avoid rounding errors.
- double dist = 0.01 * proj.getDefaultZoomInPPD();
- LatLon ll1 = proj.eastNorth2latlon(new EastNorth(center.east() - dist, center.north()));
- LatLon ll2 = proj.eastNorth2latlon(new EastNorth(center.east() + dist, center.north()));
- double meterPerEasting = ll1.greatCircleDistance(ll2) / dist / 2;
- double scale = meterPerPixel / meterPerEasting; // unit: easting per pixel
- viewport = new ViewportData(center, scale);
- } catch (NumberFormatException ex) {
- Main.warn(ex);
- }
- }
- }
- }
+ viewport = readViewportData(root);
+ projectionChoice = readProjectionChoiceData(root);
Element layersEl = getElementByTagName(root, "layers");
if (layersEl == null) return;
@@ -549,6 +614,49 @@ public class SessionReader {
}
}
+ private static SessionViewportData readViewportData(Element root) {
+ Element viewportEl = getElementByTagName(root, "viewport");
+ if (viewportEl == null) return null;
+ LatLon center = null;
+ Element centerEl = getElementByTagName(viewportEl, "center");
+ if (centerEl == null || !centerEl.hasAttribute("lat") || !centerEl.hasAttribute("lon")) return null;
+ try {
+ center = new LatLon(Double.parseDouble(centerEl.getAttribute("lat")),
+ Double.parseDouble(centerEl.getAttribute("lon")));
+ } catch (NumberFormatException ex) {
+ Main.warn(ex);
+ }
+ if (center == null) return null;
+ Element scaleEl = getElementByTagName(viewportEl, "scale");
+ if (scaleEl == null || !scaleEl.hasAttribute("meter-per-pixel")) return null;
+ try {
+ double scale = Double.parseDouble(scaleEl.getAttribute("meter-per-pixel"));
+ return new SessionViewportData(center, scale);
+ } catch (NumberFormatException ex) {
+ Main.warn(ex);
+ return null;
+ }
+ }
+
+ private static SessionProjectionChoiceData readProjectionChoiceData(Element root) {
+ Element projectionEl = getElementByTagName(root, "projection");
+ if (projectionEl == null) return null;
+ Element projectionChoiceEl = getElementByTagName(projectionEl, "projection-choice");
+ if (projectionChoiceEl == null) return null;
+ Element idEl = getElementByTagName(projectionChoiceEl, "id");
+ if (idEl == null) return null;
+ String id = idEl.getTextContent();
+ Element parametersEl = getElementByTagName(projectionChoiceEl, "parameters");
+ if (parametersEl == null) return null;
+ Collection<String> parameters = new ArrayList<>();
+ NodeList paramNl = parametersEl.getElementsByTagName("param");
+ for (int i = 0; i < paramNl.getLength(); i++) {
+ Element paramEl = (Element) paramNl.item(i);
+ parameters.add(paramEl.getTextContent());
+ }
+ return new SessionProjectionChoiceData(id, parameters);
+ }
+
/**
* Show Dialog when there is an error for one layer.
* Ask the user whether to cancel the complete session loading or just to skip this layer.
diff --git a/src/org/openstreetmap/josm/io/session/SessionWriter.java b/src/org/openstreetmap/josm/io/session/SessionWriter.java
index b95cf8a..7851a5c 100644
--- a/src/org/openstreetmap/josm/io/session/SessionWriter.java
+++ b/src/org/openstreetmap/josm/io/session/SessionWriter.java
@@ -10,6 +10,7 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -39,6 +40,7 @@ import org.openstreetmap.josm.gui.layer.WMSLayer;
import org.openstreetmap.josm.gui.layer.WMTSLayer;
import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer;
import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
+import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.MultiMap;
import org.openstreetmap.josm.tools.Utils;
@@ -212,18 +214,8 @@ public class SessionWriter {
root.setAttribute("version", "0.1");
doc.appendChild(root);
- Element viewportEl = doc.createElement("viewport");
- root.appendChild(viewportEl);
- Element centerEl = doc.createElement("center");
- viewportEl.appendChild(centerEl);
- EastNorth center = Main.map.mapView.getCenter();
- LatLon centerLL = Projections.inverseProject(center);
- centerEl.setAttribute("lat", Double.toString(centerLL.lat()));
- centerEl.setAttribute("lon", Double.toString(centerLL.lon()));
- Element scale = doc.createElement("scale");
- viewportEl.appendChild(scale);
- double dist100px = Main.map.mapView.getDist100Pixel();
- scale.setAttribute("meter-per-pixel", Double.toString(dist100px / 100));
+ writeViewPort(root);
+ writeProjection(root);
Element layersEl = doc.createElement("layers");
if (active >= 0) {
@@ -262,6 +254,50 @@ public class SessionWriter {
return doc;
}
+ private static void writeViewPort(Element root) {
+ Document doc = root.getOwnerDocument();
+ Element viewportEl = doc.createElement("viewport");
+ root.appendChild(viewportEl);
+ Element centerEl = doc.createElement("center");
+ viewportEl.appendChild(centerEl);
+ EastNorth center = Main.map.mapView.getCenter();
+ LatLon centerLL = Projections.inverseProject(center);
+ centerEl.setAttribute("lat", Double.toString(centerLL.lat()));
+ centerEl.setAttribute("lon", Double.toString(centerLL.lon()));
+ Element scale = doc.createElement("scale");
+ viewportEl.appendChild(scale);
+ double dist100px = Main.map.mapView.getDist100Pixel();
+ scale.setAttribute("meter-per-pixel", Double.toString(dist100px / 100));
+ }
+
+ private static void writeProjection(Element root) {
+ Document doc = root.getOwnerDocument();
+ Element projectionEl = doc.createElement("projection");
+ root.appendChild(projectionEl);
+ String pcId = ProjectionPreference.getCurrentProjectionChoiceId();
+ Element projectionChoiceEl = doc.createElement("projection-choice");
+ projectionEl.appendChild(projectionChoiceEl);
+ Element idEl = doc.createElement("id");
+ projectionChoiceEl.appendChild(idEl);
+ idEl.setTextContent(pcId);
+ Collection<String> parameters = ProjectionPreference.getSubprojectionPreference(pcId);
+ Element parametersEl = doc.createElement("parameters");
+ projectionChoiceEl.appendChild(parametersEl);
+ if (parameters != null) {
+ for (String param : parameters) {
+ Element paramEl = doc.createElement("param");
+ parametersEl.appendChild(paramEl);
+ paramEl.setTextContent(param);
+ }
+ }
+ String code = Main.getProjection().toCode();
+ if (code != null) {
+ Element codeEl = doc.createElement("code");
+ projectionEl.appendChild(codeEl);
+ codeEl.setTextContent(code);
+ }
+ }
+
/**
* Writes given .jos document to an output stream.
* @param doc session document
diff --git a/src/org/openstreetmap/josm/tools/ColorScale.java b/src/org/openstreetmap/josm/tools/ColorScale.java
index aabbe89..76004aa 100644
--- a/src/org/openstreetmap/josm/tools/ColorScale.java
+++ b/src/org/openstreetmap/josm/tools/ColorScale.java
@@ -61,9 +61,9 @@ public final class ColorScale {
angle -= quadrant;
quadrant = Utils.mod(quadrant+1, 4);
- float vh = h[quadrant] * w(angle) + h[quadrant+1] * (1 - w(angle));
- float vs = s[quadrant] * w(angle) + s[Utils.mod(quadrant+1, 4)] * (1 - w(angle));
- float vb = b[quadrant] * w(angle) + b[Utils.mod(quadrant+1, 4)] * (1 - w(angle));
+ float vh = h[quadrant] * weighted(angle) + h[quadrant+1] * (1 - weighted(angle));
+ float vs = s[quadrant] * weighted(angle) + s[Utils.mod(quadrant+1, 4)] * (1 - weighted(angle));
+ float vb = b[quadrant] * weighted(angle) + b[Utils.mod(quadrant+1, 4)] * (1 - weighted(angle));
sc.colors[i] = Color.getHSBColor(vh/360f, vs/100f, vb/100f);
}
@@ -78,7 +78,7 @@ public final class ColorScale {
* @param x number: 0<=x<=1
* @return the weighted value
*/
- private static float w(float x) {
+ private static float weighted(float x) {
if (x < 0.5)
return 1 - 2*x*x;
else
diff --git a/src/org/openstreetmap/josm/tools/I18n.java b/src/org/openstreetmap/josm/tools/I18n.java
index 4dc61d7..ea3b541 100644
--- a/src/org/openstreetmap/josm/tools/I18n.java
+++ b/src/org/openstreetmap/josm/tools/I18n.java
@@ -96,7 +96,7 @@ public final class I18n {
private static volatile String loadedCode = "en";
/* Localization keys for file chooser (and color chooser). */
- private static final String[] javaInternalMessageKeys = new String[] {
+ private static final String[] JAVA_INTERNAL_MESSAGE_KEYS = new String[] {
/* JFileChooser windows laf */
"FileChooser.detailsViewActionLabelText",
"FileChooser.detailsViewButtonAccessibleName",
@@ -690,7 +690,7 @@ public final class I18n {
AbstractFileChooser.setDefaultLocale(l);
JFileChooser.setDefaultLocale(l);
JColorChooser.setDefaultLocale(l);
- for (String key : javaInternalMessageKeys) {
+ for (String key : JAVA_INTERNAL_MESSAGE_KEYS) {
String us = UIManager.getString(key, Locale.US);
String loc = UIManager.getString(key, l);
// only provide custom translation if it is not already localized by Java
diff --git a/src/org/openstreetmap/josm/tools/ImageProvider.java b/src/org/openstreetmap/josm/tools/ImageProvider.java
index d1a6871..fe39e52 100644
--- a/src/org/openstreetmap/josm/tools/ImageProvider.java
+++ b/src/org/openstreetmap/josm/tools/ImageProvider.java
@@ -1713,7 +1713,7 @@ public class ImageProvider {
ImageReader reader = iter.next();
ImageReadParam param = reader.getDefaultReadParam();
reader.setInput(stream, true, !readMetadata && !enforceTransparency);
- BufferedImage bi;
+ BufferedImage bi = null;
try {
bi = reader.read(0, param);
if (bi.getTransparency() != Transparency.TRANSLUCENT && (readMetadata || enforceTransparency)) {
@@ -1730,6 +1730,10 @@ public class ImageProvider {
}
}
}
+ } catch (LinkageError e) {
+ // On Windows, ComponentColorModel.getRGBComponent can fail with "UnsatisfiedLinkError: no awt in java.library.path", see #13973
+ // Then it can leads to "NoClassDefFoundError: Could not initialize class sun.awt.image.ShortInterleavedRaster", see #15079
+ Main.error(e);
} finally {
reader.dispose();
stream.close();
diff --git a/src/org/openstreetmap/josm/tools/InputMapUtils.java b/src/org/openstreetmap/josm/tools/InputMapUtils.java
index af08cb3..bcf2f71 100644
--- a/src/org/openstreetmap/josm/tools/InputMapUtils.java
+++ b/src/org/openstreetmap/josm/tools/InputMapUtils.java
@@ -34,10 +34,10 @@ public final class InputMapUtils {
*/
public static void unassignCtrlShiftUpDown(JComponent cmp, int condition) {
InputMap inputMap = SwingUtilities.getUIInputMap(cmp, condition);
- inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK));
- inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK));
- inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.ALT_MASK | InputEvent.SHIFT_MASK));
- inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.ALT_MASK | InputEvent.SHIFT_MASK));
+ inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK));
+ inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK));
+ inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.ALT_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK));
+ inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.ALT_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK));
SwingUtilities.replaceUIInputMap(cmp, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, inputMap);
}
diff --git a/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java b/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java
index 142d36e..859040c 100644
--- a/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java
+++ b/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java
@@ -197,8 +197,7 @@ public final class MultikeyActionsHandler {
}
private static String formatMenuText(KeyStroke keyStroke, String index, String description) {
- String shortcutText = KeyEvent.getKeyModifiersText(keyStroke.getModifiers()) + '+'
- + KeyEvent.getKeyText(keyStroke.getKeyCode()) + ',' + index;
+ String shortcutText = Shortcut.getKeyText(keyStroke) + ',' + index;
return "<html><i>" + shortcutText + "</i> " + description;
}
diff --git a/src/org/openstreetmap/josm/tools/PlatformHookOsx.java b/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
index a174ffd..59b9a4d 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
@@ -30,7 +30,7 @@ import org.xml.sax.SAXException;
*/
public class PlatformHookOsx implements PlatformHook, InvocationHandler {
- private static final PlatformHookOsx ivhandler = new PlatformHookOsx();
+ private static final PlatformHookOsx INVOCATION_HANDLER = new PlatformHookOsx();
private String oSBuildNumber;
@@ -58,7 +58,7 @@ public class PlatformHookOsx implements PlatformHook, InvocationHandler {
Class<?> openFilesHandler = findHandlerClass("OpenFilesHandler");
Class<?> preferencesHandler = findHandlerClass("PreferencesHandler");
Object proxy = Proxy.newProxyInstance(PlatformHookOsx.class.getClassLoader(), new Class<?>[] {
- quitHandler, aboutHandler, openFilesHandler, preferencesHandler}, ivhandler);
+ quitHandler, aboutHandler, openFilesHandler, preferencesHandler}, INVOCATION_HANDLER);
Object appli = eawtApplication.getConstructor((Class[]) null).newInstance((Object[]) null);
if (Utils.getJavaVersion() >= 9) {
setHandlers(Desktop.class, quitHandler, aboutHandler, openFilesHandler, preferencesHandler, proxy, Desktop.getDesktop());
diff --git a/src/org/openstreetmap/josm/tools/Shortcut.java b/src/org/openstreetmap/josm/tools/Shortcut.java
index 4d8bc34..fda3c3a 100644
--- a/src/org/openstreetmap/josm/tools/Shortcut.java
+++ b/src/org/openstreetmap/josm/tools/Shortcut.java
@@ -205,7 +205,7 @@ public final class Shortcut {
public boolean isEvent(KeyEvent e) {
KeyStroke ks = getKeyStroke();
- return ks != null && ks.equals(KeyStroke.getKeyStroke(e.getKeyCode(), e.getModifiers()));
+ return ks != null && ks.equals(KeyStroke.getKeyStroke(e.getKeyCode(), e.getModifiersEx()));
}
/**
@@ -253,9 +253,18 @@ public final class Shortcut {
* @return a human readable text for the shortcut
*/
public String getKeyText() {
- KeyStroke keyStroke = getKeyStroke();
+ return getKeyText(getKeyStroke());
+ }
+
+ /**
+ * Returns a human readable text for the key stroke.
+ * @param keyStroke key stroke to convert to human readable text
+ * @return a human readable text for the key stroke
+ * @since 12520
+ */
+ public static String getKeyText(KeyStroke keyStroke) {
if (keyStroke == null) return "";
- String modifText = KeyEvent.getKeyModifiersText(keyStroke.getModifiers());
+ String modifText = KeyEvent.getModifiersExText(keyStroke.getModifiers());
if ("".equals(modifText)) return KeyEvent.getKeyText(keyStroke.getKeyCode());
return modifText + '+' + KeyEvent.getKeyText(keyStroke.getKeyCode());
}
diff --git a/src/org/openstreetmap/josm/tools/Territories.java b/src/org/openstreetmap/josm/tools/Territories.java
index 894e7b8..40b81e7 100644
--- a/src/org/openstreetmap/josm/tools/Territories.java
+++ b/src/org/openstreetmap/josm/tools/Territories.java
@@ -27,6 +27,9 @@ import org.openstreetmap.josm.io.OsmReader;
*/
public final class Territories {
+ /** Internal OSM filename */
+ public static final String FILENAME = "boundaries.osm";
+
private static final String ISO3166_1 = "ISO3166-1:alpha2";
private static final String ISO3166_2 = "ISO3166-2";
@@ -78,7 +81,7 @@ public final class Territories {
*/
public static synchronized void initialize() {
iso3166Cache = new HashMap<>();
- try (CachedFile cf = new CachedFile("resource://data/boundaries.osm");
+ try (CachedFile cf = new CachedFile("resource://data/" + FILENAME);
InputStream is = cf.getInputStream()) {
dataSet = OsmReader.parseDataSet(is, null);
Collection<OsmPrimitive> candidates = new ArrayList<>(dataSet.getWays());
diff --git a/test/data/renderer/area-text/reference.png b/test/data/renderer/area-text/reference.png
index 92e0101..e3c9c18 100644
Binary files a/test/data/renderer/area-text/reference.png and b/test/data/renderer/area-text/reference.png differ
diff --git a/test/data/renderer/area-text/style.mapcss b/test/data/renderer/area-text/style.mapcss
index a859d36..358d929 100644
--- a/test/data/renderer/area-text/style.mapcss
+++ b/test/data/renderer/area-text/style.mapcss
@@ -12,6 +12,15 @@ area[test] {
width: 1;
}
+area[test=C] {
+ text-offset-x: 5;
+ text-offset-y: -10.5;
+}
+
+area[test=D] {
+ text-offset: list(10.2, 20.5);
+}
+
area[test=H] {
text: eval("");
}
diff --git a/test/data/renderer/way-dashes-clamp/data.osm b/test/data/renderer/way-dashes-clamp/data.osm
new file mode 100644
index 0000000..15fb44f
--- /dev/null
+++ b/test/data/renderer/way-dashes-clamp/data.osm
@@ -0,0 +1,165 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' upload='never' generator='JOSM'>
+ <node id='-32972' action='modify' lat='-1.1' lon='0.9' />
+ <node id='-32974' action='modify' lat='-1.09' lon='0.8' />
+ <node id='-32976' action='modify' lat='-1.08' lon='0.7' />
+ <node id='-32978' action='modify' lat='-1.07' lon='0.6' />
+ <node id='-32980' action='modify' lat='-1.06' lon='0.5' />
+ <node id='-32982' action='modify' lat='-1.05' lon='0.4' />
+ <node id='-32984' action='modify' lat='2.1' lon='0.9' />
+ <node id='-32986' action='modify' lat='2.11' lon='0.8' />
+ <node id='-32988' action='modify' lat='2.12' lon='0.7' />
+ <node id='-32990' action='modify' lat='2.13' lon='0.6' />
+ <node id='-32992' action='modify' lat='2.14' lon='0.5' />
+ <node id='-32994' action='modify' lat='2.15' lon='0.4' />
+ <node id='-32996' action='modify' lat='0.1' lon='-1.1' />
+ <node id='-32998' action='modify' lat='0.1' lon='0.3' />
+ <node id='-33000' action='modify' lat='0.2' lon='-1.1' />
+ <node id='-33002' action='modify' lat='0.2' lon='0.3' />
+ <node id='-33004' action='modify' lat='0.3' lon='-1.1' />
+ <node id='-33006' action='modify' lat='0.3' lon='0.3' />
+ <node id='-33008' action='modify' lat='0.9934996824' lon='-0.21174218751' />
+ <node id='-33010' action='modify' lat='1.04506908317' lon='-0.18731070987' />
+ <node id='-33012' action='modify' lat='1.09663763724' lon='-0.1194454942' />
+ <node id='-33014' action='modify' lat='1.09663763724' lon='-0.05700949577' />
+ <node id='-33016' action='modify' lat='1.09663763724' lon='0.00814111127' />
+ <node id='-33018' action='modify' lat='1.01792739618' lon='0.07057710969' />
+ <node id='-33020' action='modify' lat='0.93107249265' lon='0.07057710969' />
+ <node id='-33022' action='modify' lat='0.8442154493' lon='0.04614563205' />
+ <node id='-33024' action='modify' lat='0.80621487095' lon='-0.04615106127' />
+ <node id='-33026' action='modify' lat='0.80621487095' lon='-0.14659158046' />
+ <node id='-33028' action='modify' lat='0.85507268992' lon='-0.27689279456' />
+ <node id='-33030' action='modify' lat='1.00978484526' lon='-0.29860966357' />
+ <node id='-33032' action='modify' lat='1.10477996037' lon='-0.2606051428' />
+ <node id='-33034' action='modify' lat='1.17263176973' lon='-0.14930618909' />
+ <node id='-33036' action='modify' lat='1.20248605043' lon='0.03257258891' />
+ <node id='-33038' action='modify' lat='1.10477996037' lon='0.15472997713' />
+ <node id='-33040' action='modify' lat='0.97992865197' lon='0.15744458576' />
+ <node id='-33042' action='modify' lat='0.8252152055' lon='0.15744458576' />
+ <node id='-33044' action='modify' lat='0.72478388736' lon='0.04614563205' />
+ <node id='-33046' action='modify' lat='0.67321016342' lon='-0.11673088557' />
+ <node id='-33048' action='modify' lat='0.71664070576' lon='-0.29318044632' />
+ <node id='-33050' action='modify' lat='0.79264314901' lon='-0.35018722749' />
+ <node id='-33052' action='modify' lat='0.95821488924' lon='-0.40447940003' />
+ <node id='-33054' action='modify' lat='1.12106453953' lon='-0.36918948788' />
+ <node id='-33056' action='modify' lat='1.22148405957' lon='-0.200883753' />
+ <node id='-33058' action='modify' lat='1.26762151842' lon='-0.06515332166' />
+ <node id='-33060' action='modify' lat='1.23776796057' lon='0.15744458576' />
+ <node id='-33062' action='modify' lat='1.10477996037' lon='0.24431206182' />
+ <node id='-33064' action='modify' lat='0.89578706558' lon='0.26059971358' />
+ <node id='-33066' action='modify' lat='0.77907138258' lon='0.24702667045' />
+ <node id='-33068' action='modify' lat='0.58906240901' lon='0.0407164148' />
+ <node id='-33070' action='modify' lat='0.54563080136' lon='-0.18731070987' />
+ <node id='-33072' action='modify' lat='0.59177687351' lon='-0.34204340161' />
+ <node id='-33074' action='modify' lat='0.68135342032' lon='-0.4424839208' />
+ <node id='-33076' action='modify' lat='0.86864419747' lon='-0.5022053106' />
+ <node id='-33078' action='modify' lat='1.05592569263' lon='-0.45605696394' />
+ <node id='-33080' action='modify' lat='1.19705802345' lon='-0.37733331376' />
+ <node id='-33082' action='modify' lat='1.29747473208' lon='-0.28503662044' />
+ <node id='-33084' action='modify' lat='1.32189982704' lon='-0.04615106127' />
+ <node id='-33086' action='modify' lat='1.32189982704' lon='0.12486928223' />
+ <node id='-33088' action='modify' lat='1.2486238391' lon='0.26331432221' />
+ <node id='-33090' action='modify' lat='1.07221053561' lon='0.29588962573' />
+ <node id='-33092' action='modify' lat='0.66506689291' lon='0.28774579985' />
+ <node id='-33094' action='modify' lat='0.49948437527' lon='0.11944006498' />
+ <node id='-33096' action='modify' lat='0.42347780473' lon='-0.07872636479' />
+ <node id='-33098' action='modify' lat='0.44519404964' lon='-0.25517592554' />
+ <node id='-33100' action='modify' lat='0.49405536208' lon='-0.40990861728' />
+ <node id='-33102' action='modify' lat='0.91750121561' lon='0.323035712' />
+ <way id='-33104' action='modify'>
+ <nd ref='-32994' />
+ <nd ref='-32982' />
+ <tag k='pattern' v='A' />
+ </way>
+ <way id='-33106' action='modify'>
+ <nd ref='-32992' />
+ <nd ref='-32980' />
+ <tag k='pattern' v='A' />
+ </way>
+ <way id='-33108' action='modify'>
+ <nd ref='-32990' />
+ <nd ref='-32978' />
+ <tag k='pattern' v='A' />
+ </way>
+ <way id='-33110' action='modify'>
+ <nd ref='-32988' />
+ <nd ref='-32976' />
+ <tag k='pattern' v='A' />
+ </way>
+ <way id='-33112' action='modify'>
+ <nd ref='-32986' />
+ <nd ref='-32974' />
+ <tag k='pattern' v='A' />
+ </way>
+ <way id='-33114' action='modify'>
+ <nd ref='-32984' />
+ <nd ref='-32972' />
+ <tag k='pattern' v='A' />
+ </way>
+ <way id='-33116' action='modify'>
+ <nd ref='-33008' />
+ <nd ref='-33010' />
+ <nd ref='-33012' />
+ <nd ref='-33014' />
+ <nd ref='-33016' />
+ <nd ref='-33018' />
+ <nd ref='-33020' />
+ <nd ref='-33022' />
+ <nd ref='-33024' />
+ <nd ref='-33026' />
+ <nd ref='-33028' />
+ <nd ref='-33030' />
+ <nd ref='-33032' />
+ <nd ref='-33034' />
+ <nd ref='-33036' />
+ <nd ref='-33038' />
+ <nd ref='-33040' />
+ <nd ref='-33042' />
+ <nd ref='-33044' />
+ <nd ref='-33046' />
+ <nd ref='-33048' />
+ <nd ref='-33050' />
+ <nd ref='-33052' />
+ <nd ref='-33054' />
+ <nd ref='-33056' />
+ <nd ref='-33058' />
+ <nd ref='-33060' />
+ <nd ref='-33062' />
+ <nd ref='-33064' />
+ <nd ref='-33066' />
+ <nd ref='-33068' />
+ <nd ref='-33070' />
+ <nd ref='-33072' />
+ <nd ref='-33074' />
+ <nd ref='-33076' />
+ <nd ref='-33078' />
+ <nd ref='-33080' />
+ <nd ref='-33082' />
+ <nd ref='-33084' />
+ <nd ref='-33086' />
+ <nd ref='-33088' />
+ <nd ref='-33090' />
+ <nd ref='-33102' />
+ <nd ref='-33092' />
+ <nd ref='-33094' />
+ <nd ref='-33096' />
+ <nd ref='-33098' />
+ <nd ref='-33100' />
+ <tag k='pattern' v='A' />
+ </way>
+ <way id='-33121' action='modify'>
+ <nd ref='-33004' />
+ <nd ref='-33006' />
+ <tag k='pattern' v='A' />
+ </way>
+ <way id='-33128' action='modify'>
+ <nd ref='-33000' />
+ <nd ref='-33002' />
+ <tag k='pattern' v='B' />
+ </way>
+ <way id='-33135' action='modify'>
+ <nd ref='-32996' />
+ <nd ref='-32998' />
+ <tag k='pattern' v='C' />
+ </way>
+</osm>
diff --git a/test/data/renderer/way-dashes-clamp/reference.png b/test/data/renderer/way-dashes-clamp/reference.png
new file mode 100644
index 0000000..56851e9
Binary files /dev/null and b/test/data/renderer/way-dashes-clamp/reference.png differ
diff --git a/test/data/renderer/way-dashes-clamp/style.mapcss b/test/data/renderer/way-dashes-clamp/style.mapcss
new file mode 100644
index 0000000..e6647fa
--- /dev/null
+++ b/test/data/renderer/way-dashes-clamp/style.mapcss
@@ -0,0 +1,20 @@
+canvas {
+ default-points: false;
+ default-lines: false;
+}
+
+way[pattern] {
+ width: 10;
+ color: red;
+ dashes: 20, 20;
+ dashes-background-color: green;
+ dashes-offset: 0;
+}
+
+way[pattern=B] {
+ dashes-offset: 4;
+}
+
+way[pattern=C] {
+ dashes-offset: 8;
+}
diff --git a/test/data/renderer/way-dashes/data.osm b/test/data/renderer/way-dashes/data.osm
index c19928e..decd1da 100644
--- a/test/data/renderer/way-dashes/data.osm
+++ b/test/data/renderer/way-dashes/data.osm
@@ -1,103 +1,88 @@
<?xml version='1.0' encoding='UTF-8'?>
<osm version='0.6' upload='never' generator='JOSM'>
- <node id='-38146' action='modify' lat='0.1' lon='0.1' />
- <node id='-38148' action='modify' lat='0.15' lon='0.3' />
- <node id='-38150' action='modify' lat='0.1' lon='0.5' />
- <node id='-38152' action='modify' lat='0.1' lon='0.7' />
- <node id='-38154' action='modify' lat='0.1' lon='0.9' />
- <node id='-38156' action='modify' lat='0.3' lon='0.1' />
- <node id='-38158' action='modify' lat='0.35' lon='0.3' />
- <node id='-38160' action='modify' lat='0.3' lon='0.5' />
- <node id='-38162' action='modify' lat='0.3' lon='0.7' />
- <node id='-38164' action='modify' lat='0.3' lon='0.9' />
- <node id='-38166' action='modify' lat='0.5' lon='0.1' />
- <node id='-38168' action='modify' lat='0.55' lon='0.3' />
- <node id='-38170' action='modify' lat='0.5' lon='0.5' />
- <node id='-38172' action='modify' lat='0.5' lon='0.7' />
- <node id='-38174' action='modify' lat='0.5' lon='0.9' />
- <node id='-38176' action='modify' lat='0.7' lon='0.1' />
- <node id='-38178' action='modify' lat='0.75' lon='0.3' />
- <node id='-38180' action='modify' lat='0.7' lon='0.5' />
- <node id='-38182' action='modify' lat='0.7' lon='0.7' />
- <node id='-38184' action='modify' lat='0.7' lon='0.9' />
- <node id='-38186' action='modify' lat='0.9' lon='0.1' />
- <node id='-38188' action='modify' lat='0.95' lon='0.3' />
- <node id='-38190' action='modify' lat='0.9' lon='0.5' />
- <node id='-38192' action='modify' lat='0.9' lon='0.7' />
- <node id='-38194' action='modify' lat='0.9' lon='0.9' />
- <node id='-38242' action='modify' lat='0.2993788257' lon='-0.49438751221' />
- <node id='-38243' action='modify' lat='0.38452134447' lon='0.01098358154' />
- <node id='-38245' action='modify' lat='0.41473301158' lon='0.51910125732' />
- <node id='-38247' action='modify' lat='0.40923998953' lon='0.99700653076' />
- <node id='-38249' action='modify' lat='0.27465989777' lon='1.13982879639' />
- <node id='-38294' action='modify' lat='-0.3048664203' lon='1.31011688232' />
- <way id='-38196' action='modify'>
- <nd ref='-38194' />
- <nd ref='-38192' />
+ <node id='-32972' action='modify' lat='0.1' lon='0.1' />
+ <node id='-32974' action='modify' lat='0.15' lon='0.3' />
+ <node id='-32976' action='modify' lat='0.1' lon='0.5' />
+ <node id='-32978' action='modify' lat='0.1' lon='0.7' />
+ <node id='-32980' action='modify' lat='0.1' lon='0.9' />
+ <node id='-32982' action='modify' lat='0.3' lon='0.1' />
+ <node id='-32984' action='modify' lat='0.35' lon='0.3' />
+ <node id='-32986' action='modify' lat='0.3' lon='0.5' />
+ <node id='-32988' action='modify' lat='0.3' lon='0.7' />
+ <node id='-32990' action='modify' lat='0.3' lon='0.9' />
+ <node id='-32992' action='modify' lat='0.5' lon='0.1' />
+ <node id='-32994' action='modify' lat='0.55' lon='0.3' />
+ <node id='-32996' action='modify' lat='0.5' lon='0.5' />
+ <node id='-32998' action='modify' lat='0.5' lon='0.7' />
+ <node id='-33000' action='modify' lat='0.5' lon='0.9' />
+ <node id='-33002' action='modify' lat='0.7' lon='0.1' />
+ <node id='-33004' action='modify' lat='0.75' lon='0.3' />
+ <node id='-33006' action='modify' lat='0.7' lon='0.5' />
+ <node id='-33008' action='modify' lat='0.7' lon='0.7' />
+ <node id='-33010' action='modify' lat='0.7' lon='0.9' />
+ <node id='-33012' action='modify' lat='0.9' lon='0.1' />
+ <node id='-33014' action='modify' lat='0.95' lon='0.3' />
+ <node id='-33016' action='modify' lat='0.9' lon='0.5' />
+ <node id='-33018' action='modify' lat='0.9' lon='0.7' />
+ <node id='-33020' action='modify' lat='0.9' lon='0.9' />
+ <way id='-33034' action='modify'>
+ <nd ref='-33020' />
+ <nd ref='-33018' />
<tag k='highlight' v='yes' />
<tag k='test' v='style5' />
</way>
- <way id='-38198' action='modify'>
- <nd ref='-38184' />
- <nd ref='-38182' />
+ <way id='-33036' action='modify'>
+ <nd ref='-33010' />
+ <nd ref='-33008' />
<tag k='highlight' v='yes' />
<tag k='test' v='style4' />
</way>
- <way id='-38200' action='modify'>
- <nd ref='-38174' />
- <nd ref='-38172' />
+ <way id='-33038' action='modify'>
+ <nd ref='-33000' />
+ <nd ref='-32998' />
<tag k='highlight' v='yes' />
<tag k='test' v='style3' />
</way>
- <way id='-38202' action='modify'>
- <nd ref='-38164' />
- <nd ref='-38162' />
+ <way id='-33040' action='modify'>
+ <nd ref='-32990' />
+ <nd ref='-32988' />
<tag k='highlight' v='yes' />
<tag k='test' v='style2' />
</way>
- <way id='-38204' action='modify'>
- <nd ref='-38154' />
- <nd ref='-38152' />
+ <way id='-33042' action='modify'>
+ <nd ref='-32980' />
+ <nd ref='-32978' />
<tag k='highlight' v='yes' />
<tag k='test' v='style1' />
</way>
- <way id='-38206' action='modify'>
- <nd ref='-38190' />
- <nd ref='-38188' />
- <nd ref='-38186' />
+ <way id='-33044' action='modify'>
+ <nd ref='-33016' />
+ <nd ref='-33014' />
+ <nd ref='-33012' />
<tag k='test' v='style5' />
</way>
- <way id='-38208' action='modify'>
- <nd ref='-38180' />
- <nd ref='-38178' />
- <nd ref='-38176' />
+ <way id='-33046' action='modify'>
+ <nd ref='-33006' />
+ <nd ref='-33004' />
+ <nd ref='-33002' />
<tag k='test' v='style4' />
</way>
- <way id='-38210' action='modify'>
- <nd ref='-38170' />
- <nd ref='-38168' />
- <nd ref='-38166' />
+ <way id='-33048' action='modify'>
+ <nd ref='-32996' />
+ <nd ref='-32994' />
+ <nd ref='-32992' />
<tag k='test' v='style3' />
</way>
- <way id='-38212' action='modify'>
- <nd ref='-38160' />
- <nd ref='-38158' />
- <nd ref='-38156' />
+ <way id='-33050' action='modify'>
+ <nd ref='-32986' />
+ <nd ref='-32984' />
+ <nd ref='-32982' />
<tag k='test' v='style2' />
</way>
- <way id='-38214' action='modify'>
- <nd ref='-38150' />
- <nd ref='-38148' />
- <nd ref='-38146' />
+ <way id='-33052' action='modify'>
+ <nd ref='-32976' />
+ <nd ref='-32974' />
+ <nd ref='-32972' />
<tag k='test' v='style1' />
</way>
- <way id='-38244' action='modify'>
- <nd ref='-38242' />
- <nd ref='-38243' />
- <nd ref='-38245' />
- <nd ref='-38247' />
- <nd ref='-38249' />
- <nd ref='-38294' />
- <tag k='test' v='out-of-screen' />
- </way>
</osm>
diff --git a/test/data/renderer/way-dashes/reference.png b/test/data/renderer/way-dashes/reference.png
index 0736eb0..b4f336f 100644
Binary files a/test/data/renderer/way-dashes/reference.png and b/test/data/renderer/way-dashes/reference.png differ
diff --git a/test/data/renderer/way-repeat-image-clamp/data.osm b/test/data/renderer/way-repeat-image-clamp/data.osm
new file mode 100644
index 0000000..15fb44f
--- /dev/null
+++ b/test/data/renderer/way-repeat-image-clamp/data.osm
@@ -0,0 +1,165 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' upload='never' generator='JOSM'>
+ <node id='-32972' action='modify' lat='-1.1' lon='0.9' />
+ <node id='-32974' action='modify' lat='-1.09' lon='0.8' />
+ <node id='-32976' action='modify' lat='-1.08' lon='0.7' />
+ <node id='-32978' action='modify' lat='-1.07' lon='0.6' />
+ <node id='-32980' action='modify' lat='-1.06' lon='0.5' />
+ <node id='-32982' action='modify' lat='-1.05' lon='0.4' />
+ <node id='-32984' action='modify' lat='2.1' lon='0.9' />
+ <node id='-32986' action='modify' lat='2.11' lon='0.8' />
+ <node id='-32988' action='modify' lat='2.12' lon='0.7' />
+ <node id='-32990' action='modify' lat='2.13' lon='0.6' />
+ <node id='-32992' action='modify' lat='2.14' lon='0.5' />
+ <node id='-32994' action='modify' lat='2.15' lon='0.4' />
+ <node id='-32996' action='modify' lat='0.1' lon='-1.1' />
+ <node id='-32998' action='modify' lat='0.1' lon='0.3' />
+ <node id='-33000' action='modify' lat='0.2' lon='-1.1' />
+ <node id='-33002' action='modify' lat='0.2' lon='0.3' />
+ <node id='-33004' action='modify' lat='0.3' lon='-1.1' />
+ <node id='-33006' action='modify' lat='0.3' lon='0.3' />
+ <node id='-33008' action='modify' lat='0.9934996824' lon='-0.21174218751' />
+ <node id='-33010' action='modify' lat='1.04506908317' lon='-0.18731070987' />
+ <node id='-33012' action='modify' lat='1.09663763724' lon='-0.1194454942' />
+ <node id='-33014' action='modify' lat='1.09663763724' lon='-0.05700949577' />
+ <node id='-33016' action='modify' lat='1.09663763724' lon='0.00814111127' />
+ <node id='-33018' action='modify' lat='1.01792739618' lon='0.07057710969' />
+ <node id='-33020' action='modify' lat='0.93107249265' lon='0.07057710969' />
+ <node id='-33022' action='modify' lat='0.8442154493' lon='0.04614563205' />
+ <node id='-33024' action='modify' lat='0.80621487095' lon='-0.04615106127' />
+ <node id='-33026' action='modify' lat='0.80621487095' lon='-0.14659158046' />
+ <node id='-33028' action='modify' lat='0.85507268992' lon='-0.27689279456' />
+ <node id='-33030' action='modify' lat='1.00978484526' lon='-0.29860966357' />
+ <node id='-33032' action='modify' lat='1.10477996037' lon='-0.2606051428' />
+ <node id='-33034' action='modify' lat='1.17263176973' lon='-0.14930618909' />
+ <node id='-33036' action='modify' lat='1.20248605043' lon='0.03257258891' />
+ <node id='-33038' action='modify' lat='1.10477996037' lon='0.15472997713' />
+ <node id='-33040' action='modify' lat='0.97992865197' lon='0.15744458576' />
+ <node id='-33042' action='modify' lat='0.8252152055' lon='0.15744458576' />
+ <node id='-33044' action='modify' lat='0.72478388736' lon='0.04614563205' />
+ <node id='-33046' action='modify' lat='0.67321016342' lon='-0.11673088557' />
+ <node id='-33048' action='modify' lat='0.71664070576' lon='-0.29318044632' />
+ <node id='-33050' action='modify' lat='0.79264314901' lon='-0.35018722749' />
+ <node id='-33052' action='modify' lat='0.95821488924' lon='-0.40447940003' />
+ <node id='-33054' action='modify' lat='1.12106453953' lon='-0.36918948788' />
+ <node id='-33056' action='modify' lat='1.22148405957' lon='-0.200883753' />
+ <node id='-33058' action='modify' lat='1.26762151842' lon='-0.06515332166' />
+ <node id='-33060' action='modify' lat='1.23776796057' lon='0.15744458576' />
+ <node id='-33062' action='modify' lat='1.10477996037' lon='0.24431206182' />
+ <node id='-33064' action='modify' lat='0.89578706558' lon='0.26059971358' />
+ <node id='-33066' action='modify' lat='0.77907138258' lon='0.24702667045' />
+ <node id='-33068' action='modify' lat='0.58906240901' lon='0.0407164148' />
+ <node id='-33070' action='modify' lat='0.54563080136' lon='-0.18731070987' />
+ <node id='-33072' action='modify' lat='0.59177687351' lon='-0.34204340161' />
+ <node id='-33074' action='modify' lat='0.68135342032' lon='-0.4424839208' />
+ <node id='-33076' action='modify' lat='0.86864419747' lon='-0.5022053106' />
+ <node id='-33078' action='modify' lat='1.05592569263' lon='-0.45605696394' />
+ <node id='-33080' action='modify' lat='1.19705802345' lon='-0.37733331376' />
+ <node id='-33082' action='modify' lat='1.29747473208' lon='-0.28503662044' />
+ <node id='-33084' action='modify' lat='1.32189982704' lon='-0.04615106127' />
+ <node id='-33086' action='modify' lat='1.32189982704' lon='0.12486928223' />
+ <node id='-33088' action='modify' lat='1.2486238391' lon='0.26331432221' />
+ <node id='-33090' action='modify' lat='1.07221053561' lon='0.29588962573' />
+ <node id='-33092' action='modify' lat='0.66506689291' lon='0.28774579985' />
+ <node id='-33094' action='modify' lat='0.49948437527' lon='0.11944006498' />
+ <node id='-33096' action='modify' lat='0.42347780473' lon='-0.07872636479' />
+ <node id='-33098' action='modify' lat='0.44519404964' lon='-0.25517592554' />
+ <node id='-33100' action='modify' lat='0.49405536208' lon='-0.40990861728' />
+ <node id='-33102' action='modify' lat='0.91750121561' lon='0.323035712' />
+ <way id='-33104' action='modify'>
+ <nd ref='-32994' />
+ <nd ref='-32982' />
+ <tag k='pattern' v='A' />
+ </way>
+ <way id='-33106' action='modify'>
+ <nd ref='-32992' />
+ <nd ref='-32980' />
+ <tag k='pattern' v='A' />
+ </way>
+ <way id='-33108' action='modify'>
+ <nd ref='-32990' />
+ <nd ref='-32978' />
+ <tag k='pattern' v='A' />
+ </way>
+ <way id='-33110' action='modify'>
+ <nd ref='-32988' />
+ <nd ref='-32976' />
+ <tag k='pattern' v='A' />
+ </way>
+ <way id='-33112' action='modify'>
+ <nd ref='-32986' />
+ <nd ref='-32974' />
+ <tag k='pattern' v='A' />
+ </way>
+ <way id='-33114' action='modify'>
+ <nd ref='-32984' />
+ <nd ref='-32972' />
+ <tag k='pattern' v='A' />
+ </way>
+ <way id='-33116' action='modify'>
+ <nd ref='-33008' />
+ <nd ref='-33010' />
+ <nd ref='-33012' />
+ <nd ref='-33014' />
+ <nd ref='-33016' />
+ <nd ref='-33018' />
+ <nd ref='-33020' />
+ <nd ref='-33022' />
+ <nd ref='-33024' />
+ <nd ref='-33026' />
+ <nd ref='-33028' />
+ <nd ref='-33030' />
+ <nd ref='-33032' />
+ <nd ref='-33034' />
+ <nd ref='-33036' />
+ <nd ref='-33038' />
+ <nd ref='-33040' />
+ <nd ref='-33042' />
+ <nd ref='-33044' />
+ <nd ref='-33046' />
+ <nd ref='-33048' />
+ <nd ref='-33050' />
+ <nd ref='-33052' />
+ <nd ref='-33054' />
+ <nd ref='-33056' />
+ <nd ref='-33058' />
+ <nd ref='-33060' />
+ <nd ref='-33062' />
+ <nd ref='-33064' />
+ <nd ref='-33066' />
+ <nd ref='-33068' />
+ <nd ref='-33070' />
+ <nd ref='-33072' />
+ <nd ref='-33074' />
+ <nd ref='-33076' />
+ <nd ref='-33078' />
+ <nd ref='-33080' />
+ <nd ref='-33082' />
+ <nd ref='-33084' />
+ <nd ref='-33086' />
+ <nd ref='-33088' />
+ <nd ref='-33090' />
+ <nd ref='-33102' />
+ <nd ref='-33092' />
+ <nd ref='-33094' />
+ <nd ref='-33096' />
+ <nd ref='-33098' />
+ <nd ref='-33100' />
+ <tag k='pattern' v='A' />
+ </way>
+ <way id='-33121' action='modify'>
+ <nd ref='-33004' />
+ <nd ref='-33006' />
+ <tag k='pattern' v='A' />
+ </way>
+ <way id='-33128' action='modify'>
+ <nd ref='-33000' />
+ <nd ref='-33002' />
+ <tag k='pattern' v='B' />
+ </way>
+ <way id='-33135' action='modify'>
+ <nd ref='-32996' />
+ <nd ref='-32998' />
+ <tag k='pattern' v='C' />
+ </way>
+</osm>
diff --git a/test/data/renderer/way-repeat-image-clamp/reference.png b/test/data/renderer/way-repeat-image-clamp/reference.png
new file mode 100644
index 0000000..dbbafa5
Binary files /dev/null and b/test/data/renderer/way-repeat-image-clamp/reference.png differ
diff --git a/test/data/renderer/way-repeat-image-clamp/style.mapcss b/test/data/renderer/way-repeat-image-clamp/style.mapcss
new file mode 100644
index 0000000..30a581c
--- /dev/null
+++ b/test/data/renderer/way-repeat-image-clamp/style.mapcss
@@ -0,0 +1,22 @@
+canvas {
+ default-points: false;
+ default-lines: false;
+}
+
+way[pattern] {
+ width: 1;
+ color: red;
+ repeat-image: "trees.svg";
+ repeat-image-align: bottom;
+ repeat-image-offset: 2;
+ repeat-image-spacing: 20;
+ repeat-image-phase: 0;
+}
+
+way[pattern=B] {
+ repeat-image-phase: 4;
+}
+
+way[pattern=C] {
+ repeat-image-phase: 8;
+}
diff --git a/test/data/renderer/way-repeat-image-clamp/trees.svg b/test/data/renderer/way-repeat-image-clamp/trees.svg
new file mode 100644
index 0000000..805c12f
--- /dev/null
+++ b/test/data/renderer/way-repeat-image-clamp/trees.svg
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg1"
+ sodipodi:docname="02.svg"
+ inkscape:export-filename="/datas/Projs/Cliparts Stocker/plain_tree.png"
+ viewBox="0 0 970.83973 972.18771"
+ sodipodi:version="0.32"
+ inkscape:export-xdpi="72.000000"
+ version="1.0"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-ydpi="72.000000"
+ inkscape:version="0.48.5 r10040"
+ width="100%"
+ height="100%">
+ <defs
+ id="defs3">
+ <linearGradient
+ id="linearGradient5877"
+ y2="183.60001"
+ gradientUnits="userSpaceOnUse"
+ y1="349.29999"
+ gradientTransform="scale(0.61308,1.6311)"
+ x2="207.92999"
+ x1="466.13"
+ inkscape:collect="always">
+ <stop
+ id="stop5303"
+ style="stop-color:#002f00"
+ offset="0" />
+ <stop
+ id="stop5304"
+ style="stop-color:#009300"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5880"
+ y2="457.35999"
+ gradientUnits="userSpaceOnUse"
+ y1="32.316002"
+ gradientTransform="scale(0.61308,1.6311)"
+ x2="383.14001"
+ x1="383.14001"
+ inkscape:collect="always">
+ <stop
+ id="stop2187"
+ style="stop-color:#002f00"
+ offset="0" />
+ <stop
+ id="stop2188"
+ style="stop-color:#009300"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5883"
+ y2="478.01001"
+ gradientUnits="userSpaceOnUse"
+ y1="476.92999"
+ gradientTransform="scale(0.61633,1.6225)"
+ x2="384.09"
+ x1="345.53"
+ inkscape:collect="always">
+ <stop
+ id="stop3434"
+ style="stop-color:#6c2f07"
+ offset="0" />
+ <stop
+ id="stop3435"
+ style="stop-color:#7e4932"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5883-1-7"
+ y2="478.01001"
+ gradientUnits="userSpaceOnUse"
+ y1="476.92999"
+ gradientTransform="scale(0.61633,1.6225)"
+ x2="384.09"
+ x1="345.53"
+ inkscape:collect="always">
+ <stop
+ id="stop3434-7-1"
+ style="stop-color:#6c2f07"
+ offset="0" />
+ <stop
+ id="stop3435-4-1"
+ style="stop-color:#7e4932"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5880-0-5"
+ y2="457.35999"
+ gradientUnits="userSpaceOnUse"
+ y1="32.316002"
+ gradientTransform="scale(0.61308,1.6311)"
+ x2="383.14001"
+ x1="383.14001"
+ inkscape:collect="always">
+ <stop
+ id="stop2187-9-2"
+ style="stop-color:#002f00"
+ offset="0" />
+ <stop
+ id="stop2188-4-7"
+ style="stop-color:#009300"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ y2="183.60001"
+ x2="207.92999"
+ y1="349.29999"
+ x1="466.13"
+ gradientTransform="scale(0.61308,1.6311)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3020-6"
+ xlink:href="#linearGradient5877-8-1"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient5877-8-1"
+ y2="183.60001"
+ gradientUnits="userSpaceOnUse"
+ y1="349.29999"
+ gradientTransform="scale(0.61308,1.6311)"
+ x2="207.92999"
+ x1="466.13"
+ inkscape:collect="always">
+ <stop
+ id="stop5303-8-4"
+ style="stop-color:#002f00"
+ offset="0" />
+ <stop
+ id="stop5304-2-2"
+ style="stop-color:#009300"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5883-3"
+ y2="478.01001"
+ gradientUnits="userSpaceOnUse"
+ y1="476.92999"
+ gradientTransform="scale(0.61633,1.6225)"
+ x2="384.09"
+ x1="345.53"
+ inkscape:collect="always">
+ <stop
+ id="stop3434-2"
+ style="stop-color:#6c2f07"
+ offset="0" />
+ <stop
+ id="stop3435-2"
+ style="stop-color:#7e4932"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5880-1"
+ y2="457.35999"
+ gradientUnits="userSpaceOnUse"
+ y1="32.316002"
+ gradientTransform="scale(0.61308,1.6311)"
+ x2="383.14001"
+ x1="383.14001"
+ inkscape:collect="always">
+ <stop
+ id="stop2187-6"
+ style="stop-color:#002f00"
+ offset="0" />
+ <stop
+ id="stop2188-8"
+ style="stop-color:#009300"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5877-5"
+ y2="183.60001"
+ gradientUnits="userSpaceOnUse"
+ y1="349.29999"
+ gradientTransform="scale(0.61308,1.6311)"
+ x2="207.92999"
+ x1="466.13"
+ inkscape:collect="always">
+ <stop
+ id="stop5303-7"
+ style="stop-color:#002f00"
+ offset="0" />
+ <stop
+ id="stop5304-6"
+ style="stop-color:#009300"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ y2="183.60001"
+ x2="207.92999"
+ y1="349.29999"
+ x1="466.13"
+ gradientTransform="scale(0.61308,1.6311)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3098"
+ xlink:href="#linearGradient5877-5"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="183.60001"
+ x2="207.92999"
+ y1="349.29999"
+ x1="466.13"
+ gradientTransform="scale(0.61308,1.6311)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3020-0"
+ xlink:href="#linearGradient5877-8-2"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient5877-8-2"
+ y2="183.60001"
+ gradientUnits="userSpaceOnUse"
+ y1="349.29999"
+ gradientTransform="scale(0.61308,1.6311)"
+ x2="207.92999"
+ x1="466.13"
+ inkscape:collect="always">
+ <stop
+ id="stop5303-8-48"
+ style="stop-color:#002f00"
+ offset="0" />
+ <stop
+ id="stop5304-2-6"
+ style="stop-color:#009300"
+ offset="1" />
+ </linearGradient>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ bordercolor="#666666"
+ inkscape:pageshadow="2"
+ inkscape:window-y="-4"
+ pagecolor="#ffffff"
+ inkscape:window-height="1003"
+ inkscape:zoom="0.41427105"
+ inkscape:window-x="-4"
+ showgrid="true"
+ borderopacity="1.0"
+ inkscape:current-layer="svg1"
+ inkscape:cx="-42.294561"
+ inkscape:cy="423.0624"
+ inkscape:window-width="1680"
+ inkscape:pageopacity="0.0"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-maximized="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2995"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ originx="-148.666px"
+ originy="1.0382462e-005px" />
+ </sodipodi:namedview>
+ <g
+ id="g5885"
+ transform="translate(-82.251123,-23.332315)">
+ <path
+ id="path1545"
+ style="fill:url(#linearGradient5883);fill-rule:evenodd"
+ d="m 193.88,772.09 -9.78,223.43 h 84.88 L 254.1,772.09 h -60.22 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path909"
+ sodipodi:nodetypes="ccccccccccccc"
+ style="fill:url(#linearGradient5880);fill-opacity:0.75;fill-rule:evenodd"
+ d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.11,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z"
+ inkscape:connector-curvature="0" />
+ <path
+ id="path4679"
+ sodipodi:nodetypes="ccccccccccccc"
+ style="fill:url(#linearGradient5877);fill-rule:evenodd"
+ d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.12,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z"
+ inkscape:connector-curvature="0" />
+ </g>
+ <metadata
+ id="metadata18">
+ <rdf:RDF>
+ <cc:Work>
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+ <dc:publisher>
+ <cc:Agent
+ rdf:about="http://openclipart.org/">
+ <dc:title>Openclipart</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:title></dc:title>
+ <dc:date>2008-05-26T12:05:38</dc:date>
+ <dc:description />
+ <dc:source>https://openclipart.org/detail/17043/plain_tree-by-jean_victor_balin</dc:source>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>jean_victor_balin</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>forest</rdf:li>
+ <rdf:li>garden</rdf:li>
+ <rdf:li>plant</rdf:li>
+ <rdf:li>tree</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="g5885-1"
+ transform="translate(267.93589,-23.332315)">
+ <path
+ inkscape:connector-curvature="0"
+ id="path1545-8"
+ style="fill:url(#linearGradient5883-3);fill-rule:evenodd"
+ d="m 193.88,772.09 -9.78,223.43 h 84.88 L 254.1,772.09 h -60.22 z" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path909-9"
+ sodipodi:nodetypes="ccccccccccccc"
+ style="fill:url(#linearGradient5880-1);fill-opacity:0.75;fill-rule:evenodd"
+ d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.11,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4679-2"
+ sodipodi:nodetypes="ccccccccccccc"
+ style="fill:url(#linearGradient3098);fill-rule:evenodd"
+ d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.12,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+ </g>
+ <g
+ id="g5885-4-7"
+ transform="translate(605.92089,-23.332315)">
+ <path
+ inkscape:connector-curvature="0"
+ id="path1545-5-9"
+ style="fill:url(#linearGradient5883-1-7);fill-rule:evenodd"
+ d="m 193.88,772.09 -9.78,223.43 h 84.88 L 254.1,772.09 h -60.22 z" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path909-5-5"
+ sodipodi:nodetypes="ccccccccccccc"
+ style="fill:url(#linearGradient5880-0-5);fill-opacity:0.75;fill-rule:evenodd"
+ d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.11,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4679-1-4"
+ sodipodi:nodetypes="ccccccccccccc"
+ style="fill:url(#linearGradient3020-6);fill-rule:evenodd"
+ d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.12,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+ </g>
+</svg>
diff --git a/test/data/renderer/way-text/data.osm b/test/data/renderer/way-text/data.osm
new file mode 100644
index 0000000..46b0f29
--- /dev/null
+++ b/test/data/renderer/way-text/data.osm
@@ -0,0 +1,97 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' upload='false' generator='JOSM'>
+ <node id='-41240' action='modify' lat='0.95462883113' lon='0.69245784308' />
+ <node id='-41242' action='modify' lat='0.93599139732' lon='0.64577386324' />
+ <node id='-41244' action='modify' lat='0.92917836022' lon='0.61790219137' />
+ <node id='-41246' action='modify' lat='0.83632453647' lon='0.35060605628' />
+ <node id='-41248' action='modify' lat='0.66045089174' lon='0.27991121964'>
+ <tag k='railway' v='level_crossing' />
+ </node>
+ <node id='-41250' action='modify' lat='0.65770696505' lon='0.18596808237' />
+ <node id='-41252' action='modify' lat='0.59627545707' lon='0.10271148998' />
+ <node id='-41254' action='modify' lat='0.87616034313' lon='0.70190515136' />
+ <node id='-41256' action='modify' lat='0.67834542545' lon='0.84762454988' />
+ <node id='-41258' action='modify' lat='0.45474826559' lon='0.7793912778' />
+ <node id='-41260' action='modify' lat='0.41652482996' lon='0.59838396312' />
+ <node id='-41262' action='modify' lat='0.51601034903' lon='0.48176548874' />
+ <node id='-41264' action='modify' lat='0.60557084089' lon='0.63849966061' />
+ <node id='-41266' action='modify' lat='0.33593750068' lon='0.10942032794' />
+ <node id='-41268' action='modify' lat='0.33278745947' lon='0.61343550409' />
+ <node id='-41270' action='modify' lat='0.06664816464' lon='0.84078758118' />
+ <node id='-41272' action='modify' lat='0.23990269548' lon='0.95419099581' />
+ <node id='-41274' action='modify' lat='0.0886988082' lon='0.43127525055' />
+ <node id='-41276' action='modify' lat='0.11704961586' lon='0.17296747278' />
+ <node id='-41313' action='modify' lat='0.24096122132' lon='0.05685283988' />
+ <node id='-41314' action='modify' lat='0.21659475263' lon='0.67414163902' />
+ <node id='-41328' action='modify' lat='0.33187955464' lon='0.76055992767' />
+ <node id='-41329' action='modify' lat='0.36121780698' lon='0.99112699543' />
+ <node id='-41361' action='modify' lat='0.28427927747' lon='0.86907494401' />
+ <node id='-41372' action='modify' lat='0.48191547356' lon='0.99361566664' />
+ <node id='-41374' action='modify' lat='0.52523231165' lon='0.93405271234' />
+ <node id='-41398' action='modify' lat='0.43589103184' lon='0.11370838717' />
+ <node id='-41399' action='modify' lat='0.74993303663' lon='0.59833424263' />
+ <node id='-41424' action='modify' lat='0.75264021089' lon='0.09475653807' />
+ <node id='-41425' action='modify' lat='0.98003625368' lon='0.40340093764' />
+ <way id='-41278' action='modify'>
+ <nd ref='-41240' />
+ <nd ref='-41242' />
+ <nd ref='-41244' />
+ <nd ref='-41246' />
+ <nd ref='-41248' />
+ <nd ref='-41250' />
+ <nd ref='-41252' />
+ <tag k='highway' v='tertiary' />
+ <tag k='name' v='An der Actien-Zuckerfabrik' />
+ <tag k='test' v='w1' />
+ </way>
+ <way id='-41280' action='modify'>
+ <nd ref='-41264' />
+ <nd ref='-41262' />
+ <nd ref='-41260' />
+ <nd ref='-41258' />
+ <nd ref='-41256' />
+ <nd ref='-41254' />
+ <tag k='test' v='w2' />
+ </way>
+ <way id='-41282' action='modify'>
+ <nd ref='-41266' />
+ <nd ref='-41268' />
+ <tag k='name' v='گلستان ۲' />
+ <tag k='test' v='bidi' />
+ </way>
+ <way id='-41284' action='modify'>
+ <nd ref='-41276' />
+ <nd ref='-41274' />
+ <nd ref='-41270' />
+ <nd ref='-41272' />
+ <tag k='name' v='Wolfenbütteler Straße' />
+ <tag k='test' v='opacity' />
+ </way>
+ <way id='-41315' action='modify'>
+ <nd ref='-41313' />
+ <nd ref='-41314' />
+ <tag k='name' v='Teststraße' />
+ <tag k='test' v='opacity' />
+ </way>
+ <way id='-41327' action='modify'>
+ <nd ref='-41328' />
+ <nd ref='-41361' />
+ <nd ref='-41329' />
+ <nd ref='-41372' />
+ <nd ref='-41374' />
+ <tag k='name' v='گلستان ۲' />
+ <tag k='test' v='bidi' />
+ </way>
+ <way id='-41400' action='modify'>
+ <nd ref='-41398' />
+ <nd ref='-41399' />
+ <tag k='test' v='w2' />
+ </way>
+ <way id='-41426' action='modify'>
+ <nd ref='-41424' />
+ <nd ref='-41425' />
+ <tag k='highway' v='tertiary' />
+ <tag k='name' v='An der A.-Z.' />
+ <tag k='test' v='w1' />
+ </way>
+</osm>
diff --git a/test/data/renderer/way-text/reference.png b/test/data/renderer/way-text/reference.png
new file mode 100644
index 0000000..f1fc797
Binary files /dev/null and b/test/data/renderer/way-text/reference.png differ
diff --git a/test/data/renderer/way-text/style.mapcss b/test/data/renderer/way-text/style.mapcss
new file mode 100644
index 0000000..8891b43
--- /dev/null
+++ b/test/data/renderer/way-text/style.mapcss
@@ -0,0 +1,49 @@
+canvas {
+ default-points: false;
+ default-lines: false;
+}
+way[test]{
+ font-family: "DejaVu Sans";
+}
+way[test=w1] {
+ text: name;
+ font-size: 12;
+ text-color: blue;
+ text-halo-color: yellow;
+ text-halo-radius: 2;
+ text-offset: 5;
+ color: yellow;
+ width: 2;
+}
+
+way[test=w2] {
+ text: eval("Groß Vahlberger Straße");
+ font-size: 12;
+ text-color: teal;
+ text-halo-color: #ca3;
+ text-halo-radius: 2;
+ color: #ca3;
+ width: 4;
+}
+
+way[test=bidi] { /* bi-directional text #12025 */
+ text: name;
+ font-size: 14;
+ text-color: white;
+ color: blue;
+ width: 16;
+}
+
+way[test=opacity] {
+ text-position: line;
+ text:auto;
+ font-size: 18;
+ text-color: coral;
+ text-opacity: 0.7;
+ text-halo-opacity: 0.4;
+ text-halo-color: cyan;
+ text-halo-radius: 2.5;
+ color: cyan;
+ width: 3;
+ text-offset-y: -5.5;
+}
diff --git a/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java b/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java
index e5d73d4..68031b8 100644
--- a/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java
+++ b/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java
@@ -91,6 +91,9 @@ public class MapCSSRendererTest {
/** Tests dashed ways. */
new TestConfig("way-dashes", AREA_DEFAULT),
+ /** Tests dashed way clamping algorithm */
+ new TestConfig("way-dashes-clamp", AREA_DEFAULT),
+
/** Tests fill-color property */
new TestConfig("area-fill-color", AREA_DEFAULT),
@@ -107,8 +110,12 @@ public class MapCSSRendererTest {
new TestConfig("order", AREA_DEFAULT),
/** Tests repeat-image feature for ways */
- new TestConfig("way-repeat-image", AREA_DEFAULT)
+ new TestConfig("way-repeat-image", AREA_DEFAULT),
+ /** Tests the clamping for repeat-images and repeat-image-phase */
+ new TestConfig("way-repeat-image-clamp", AREA_DEFAULT),
+ /** Tests text along a way */
+ new TestConfig("way-text", AREA_DEFAULT)
).map(e -> new Object[] {e, e.testDirectory})
.collect(Collectors.toList());
}
diff --git a/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java b/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java
index 5b7a14c..c8ffcab 100644
--- a/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java
@@ -12,10 +12,10 @@ import java.util.Set;
import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.actions.CombineWayAction.NodeGraph;
-import org.openstreetmap.josm.actions.CombineWayAction.NodePair;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.NodeGraph;
+import org.openstreetmap.josm.data.osm.NodePair;
import org.openstreetmap.josm.io.IllegalDataException;
import org.openstreetmap.josm.io.OsmReader;
import org.openstreetmap.josm.testutils.JOSMTestRules;
diff --git a/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java b/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java
index 7185fca..e81414c 100644
--- a/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java
@@ -74,9 +74,9 @@ public class DrawActionTest {
Main.map,
MouseEvent.MOUSE_RELEASED,
2000,
- InputEvent.BUTTON1_MASK,
+ InputEvent.BUTTON1_DOWN_MASK,
50, 0,
- 2, false));
+ 2, false, MouseEvent.BUTTON1));
JList<OsmPrimitive> lstPrimitives = new JList<>();
OsmPrimitivRenderer renderer = new OsmPrimitivRenderer();
diff --git a/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java b/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java
index f69cd24..3ab0aa1 100644
--- a/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java
@@ -99,26 +99,26 @@ public class SelectActionTest {
event = new MouseEvent(Main.map,
MouseEvent.MOUSE_PRESSED,
0,
- InputEvent.BUTTON1_MASK | InputEvent.CTRL_MASK,
+ InputEvent.BUTTON1_DOWN_MASK | InputEvent.CTRL_DOWN_MASK,
100, 0,
1,
- false);
+ false, MouseEvent.BUTTON1);
action.mousePressed(event);
event = new MouseEvent(Main.map,
MouseEvent.MOUSE_DRAGGED,
1000,
- InputEvent.BUTTON1_MASK | InputEvent.CTRL_MASK,
+ InputEvent.BUTTON1_DOWN_MASK | InputEvent.CTRL_DOWN_MASK,
50, 0,
1,
- false);
+ false, MouseEvent.BUTTON1);
action.mouseDragged(event);
event = new MouseEvent(Main.map,
MouseEvent.MOUSE_RELEASED,
2000,
- InputEvent.BUTTON1_MASK | InputEvent.CTRL_MASK,
+ InputEvent.BUTTON1_DOWN_MASK | InputEvent.CTRL_DOWN_MASK,
5, 0,
1,
- false);
+ false, MouseEvent.BUTTON1);
action.mouseReleased(event);
// As result of test, we must find a 2 nodes way, from EN(0, 0) to EN(100, 0)
diff --git a/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java b/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
index b0daaea..17e6ba0 100644
--- a/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
@@ -7,9 +7,13 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
import org.junit.Rule;
import org.junit.Test;
@@ -30,6 +34,11 @@ import org.openstreetmap.josm.data.osm.Tag;
import org.openstreetmap.josm.data.osm.User;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.osm.WayData;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetMenu;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
+import org.openstreetmap.josm.gui.tagging.presets.items.Key;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import org.openstreetmap.josm.tools.date.DateUtils;
@@ -490,4 +499,193 @@ public class SearchCompilerTest {
public void testEnumExactKeyValueMode() {
TestUtils.superficialEnumCodeCoverage(ExactKeyValue.Mode.class);
}
+
+ /**
+ * Robustness test for preset searching. Ensures that the query 'preset:' is not accepted.
+ * @throws ParseError always
+ * @since 12464
+ */
+ @Test(expected = ParseError.class)
+ public void testPresetSearchMissingValue() throws ParseError {
+ SearchSetting settings = new SearchSetting();
+ settings.text = "preset:";
+ settings.mapCSSSearch = false;
+
+ TaggingPresets.readFromPreferences();
+
+ SearchCompiler.compile(settings);
+ }
+
+ /**
+ * Robustness test for preset searching. Validates that it is not possible to search for
+ * non existing presets.
+ * @throws ParseError always
+ * @since 12464
+ */
+ @Test(expected = ParseError.class)
+ public void testPresetNotExist() throws ParseError {
+ String testPresetName = "groupnamethatshouldnotexist/namethatshouldnotexist";
+ SearchSetting settings = new SearchSetting();
+ settings.text = "preset:" + testPresetName;
+ settings.mapCSSSearch = false;
+
+ // load presets
+ TaggingPresets.readFromPreferences();
+
+ SearchCompiler.compile(settings);
+ }
+
+ /**
+ * Robustness tests for preset searching. Ensures that combined preset names (having more than
+ * 1 word) must be enclosed with " .
+ * @throws ParseError always
+ * @since 12464
+ */
+ @Test(expected = ParseError.class)
+ public void testPresetMultipleWords() throws ParseError {
+ TaggingPreset testPreset = new TaggingPreset();
+ testPreset.name = "Test Combined Preset Name";
+ testPreset.group = new TaggingPresetMenu();
+ testPreset.group.name = "TestGroupName";
+
+ String combinedPresetname = testPreset.getRawName();
+ SearchSetting settings = new SearchSetting();
+ settings.text = "preset:" + combinedPresetname;
+ settings.mapCSSSearch = false;
+
+ // load presets
+ TaggingPresets.readFromPreferences();
+
+ SearchCompiler.compile(settings);
+ }
+
+
+ /**
+ * Ensures that correct presets are stored in the {@link org.openstreetmap.josm.actions.search.SearchCompiler.Preset}
+ * class against which the osm primitives are tested.
+ * @throws ParseError if an error has been encountered while compiling
+ * @throws NoSuchFieldException if there is no field called 'presets'
+ * @throws IllegalAccessException if cannot access the field where all matching presets are stored
+ * @since 12464
+ */
+ @Test
+ public void testPresetLookup() throws ParseError, NoSuchFieldException, IllegalAccessException {
+ TaggingPreset testPreset = new TaggingPreset();
+ testPreset.name = "Test Preset Name";
+ testPreset.group = new TaggingPresetMenu();
+ testPreset.group.name = "Test Preset Group Name";
+
+ String query = "preset:" +
+ "\"" + testPreset.getRawName() + "\"";
+ SearchSetting settings = new SearchSetting();
+ settings.text = query;
+ settings.mapCSSSearch = false;
+
+ // load presets and add the test preset
+ TaggingPresets.readFromPreferences();
+ TaggingPresets.addTaggingPresets(Collections.singletonList(testPreset));
+
+ Match match = SearchCompiler.compile(settings);
+
+ // access the private field where all matching presets are stored
+ // and ensure that indeed the correct ones are there
+ Field field = match.getClass().getDeclaredField("presets");
+ field.setAccessible(true);
+ @SuppressWarnings("unchecked")
+ Collection<TaggingPreset> foundPresets = (Collection<TaggingPreset>) field.get(match);
+
+ assertEquals(1, foundPresets.size());
+ assertTrue(foundPresets.contains(testPreset));
+ }
+
+ /**
+ * Ensures that the wildcard search works and that correct presets are stored in
+ * the {@link org.openstreetmap.josm.actions.search.SearchCompiler.Preset} class against which
+ * the osm primitives are tested.
+ * @throws ParseError if an error has been encountered while compiling
+ * @throws NoSuchFieldException if there is no field called 'presets'
+ * @throws IllegalAccessException if cannot access the field where all matching presets are stored
+ * @since 12464
+ */
+ @Test
+ public void testPresetLookupWildcard() throws ParseError, NoSuchFieldException, IllegalAccessException {
+ TaggingPresetMenu group = new TaggingPresetMenu();
+ group.name = "TestPresetGroup";
+
+ TaggingPreset testPreset1 = new TaggingPreset();
+ testPreset1.name = "TestPreset1";
+ testPreset1.group = group;
+
+ TaggingPreset testPreset2 = new TaggingPreset();
+ testPreset2.name = "TestPreset2";
+ testPreset2.group = group;
+
+ TaggingPreset testPreset3 = new TaggingPreset();
+ testPreset3.name = "TestPreset3";
+ testPreset3.group = group;
+
+ String query = "preset:" + "\"" + group.getRawName() + "/*\"";
+ SearchSetting settings = new SearchSetting();
+ settings.text = query;
+ settings.mapCSSSearch = false;
+
+ TaggingPresets.readFromPreferences();
+ TaggingPresets.addTaggingPresets(Arrays.asList(testPreset1, testPreset2, testPreset3));
+
+ Match match = SearchCompiler.compile(settings);
+
+ // access the private field where all matching presets are stored
+ // and ensure that indeed the correct ones are there
+ Field field = match.getClass().getDeclaredField("presets");
+ field.setAccessible(true);
+ @SuppressWarnings("unchecked")
+ Collection<TaggingPreset> foundPresets = (Collection<TaggingPreset>) field.get(match);
+
+ assertEquals(3, foundPresets.size());
+ assertTrue(foundPresets.contains(testPreset1));
+ assertTrue(foundPresets.contains(testPreset2));
+ assertTrue(foundPresets.contains(testPreset3));
+ }
+
+ /**
+ * Ensures that correct primitives are matched against the specified preset.
+ * @throws ParseError if an error has been encountered while compiling
+ * @since 12464
+ */
+ @Test
+ public void testPreset() throws ParseError {
+ final String presetName = "Test Preset Name";
+ final String presetGroupName = "Test Preset Group";
+ final String key = "test_key1";
+ final String val = "test_val1";
+
+ Key key1 = new Key();
+ key1.key = key;
+ key1.value = val;
+
+ TaggingPreset testPreset = new TaggingPreset();
+ testPreset.name = presetName;
+ testPreset.types = Collections.singleton(TaggingPresetType.NODE);
+ testPreset.data.add(key1);
+ testPreset.group = new TaggingPresetMenu();
+ testPreset.group.name = presetGroupName;
+
+ TaggingPresets.readFromPreferences();
+ TaggingPresets.addTaggingPresets(Collections.singleton(testPreset));
+
+ String query = "preset:" + "\"" + testPreset.getRawName() + "\"";
+
+ SearchContext ctx = new SearchContext(query);
+ ctx.n1.put(key, val);
+ ctx.n2.put(key, val);
+
+ for (OsmPrimitive osm : new OsmPrimitive[] {ctx.n1, ctx.n2}) {
+ ctx.match(osm, true);
+ }
+
+ for (OsmPrimitive osm : new OsmPrimitive[] {ctx.r1, ctx.r2, ctx.w1, ctx.w2}) {
+ ctx.match(osm, false);
+ }
+ }
}
+
diff --git a/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java b/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java
index e28f59e..ae0c804 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java
@@ -13,6 +13,7 @@ import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -163,6 +164,41 @@ public class DataSetTest {
ds.toggleSelected(n2.getPrimitiveId());
assertEquals(Arrays.asList(n3, n1), new ArrayList<>(ds.getSelected()));
+ }
+
+ /**
+ * Unit test for {@link DataSet#DataSet(DataSet)}.
+ */
+ @Test
+ public void testCopyConstructor() {
+ DataSet ds = new DataSet();
+ assertEqualsDataSet(ds, new DataSet(ds));
+
+ ds.setVersion("fake_version");
+ ds.setUploadPolicy(UploadPolicy.BLOCKED);
+ Node n1 = new Node(LatLon.SOUTH_POLE);
+ Node n2 = new Node(LatLon.NORTH_POLE);
+ Way w = new Way(1);
+ w.setNodes(Arrays.asList(n1, n2));
+ ds.addPrimitive(n1);
+ ds.addPrimitive(n2);
+ ds.addPrimitive(w);
+ Relation r1 = new Relation(1);
+ Relation r2 = new Relation(2);
+ r2.addMember(new RelationMember("role1", n1));
+ r2.addMember(new RelationMember("role2", w));
+ r2.addMember(new RelationMember("role3", r1));
+ ds.addPrimitive(r1);
+ ds.addPrimitive(r2);
+ assertEqualsDataSet(ds, new DataSet(ds));
+ }
+ private static void assertEqualsDataSet(DataSet ds1, DataSet ds2) {
+ assertEquals(new ArrayList<>(ds1.getNodes()), new ArrayList<>(ds2.getNodes()));
+ assertEquals(new ArrayList<>(ds1.getWays()), new ArrayList<>(ds2.getWays()));
+ assertEquals(new ArrayList<>(ds1.getRelations()), new ArrayList<>(ds2.getRelations()));
+ assertEquals(new ArrayList<>(ds1.getDataSources()), new ArrayList<>(ds2.getDataSources()));
+ assertEquals(ds1.getUploadPolicy(), ds2.getUploadPolicy());
+ assertEquals(ds1.getVersion(), ds2.getVersion());
}
}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/NodeGraphTest.java b/test/unit/org/openstreetmap/josm/data/osm/NodeGraphTest.java
new file mode 100644
index 0000000..274ac21
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/NodeGraphTest.java
@@ -0,0 +1,79 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of the {@code NodeGraph} class.
+ */
+public class NodeGraphTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of {@link NodeGraph#buildNodePairs} and {@link NodeGraph#eliminateDuplicateNodePairs}
+ */
+ @Test
+ public void testNodePairs() {
+ assertTrue(NodeGraph.buildNodePairs(Collections.emptyList(), true).isEmpty());
+ assertTrue(NodeGraph.buildNodePairs(Collections.emptyList(), false).isEmpty());
+
+ Way w1 = new Way(1);
+ Way w2 = new Way(2);
+
+ Node n1 = new Node(1);
+ Node n2 = new Node(2);
+ Node n3 = new Node(3);
+
+ Node n4 = new Node(4);
+ Node n5 = new Node(5);
+ Node n6 = new Node(6);
+
+ w1.setNodes(Arrays.asList(n1, n2, n3));
+ w2.setNodes(Arrays.asList(n4, n5, n6, n4));
+
+ w1.setIncomplete(false);
+ w2.setIncomplete(false);
+
+ List<Way> ways = Arrays.asList(w1, w2);
+
+ List<NodePair> l1 = NodeGraph.buildNodePairs(ways, true);
+ List<NodePair> l2 = NodeGraph.buildNodePairs(ways, false);
+
+ assertEquals(Arrays.asList(
+ new NodePair(n1, n2),
+ new NodePair(n2, n3),
+ new NodePair(n4, n5),
+ new NodePair(n5, n6),
+ new NodePair(n6, n4)
+ ), l1);
+
+ assertEquals(l1, NodeGraph.eliminateDuplicateNodePairs(l1));
+
+ assertEquals(Arrays.asList(
+ new NodePair(n1, n2), new NodePair(n2, n1),
+ new NodePair(n2, n3), new NodePair(n3, n2),
+ new NodePair(n4, n5), new NodePair(n5, n4),
+ new NodePair(n5, n6), new NodePair(n6, n5),
+ new NodePair(n6, n4), new NodePair(n4, n6)
+ ), l2);
+
+ assertEquals(l1, NodeGraph.eliminateDuplicateNodePairs(l2));
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTestIT.java b/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTestIT.java
index 5965b1d..f3c3240 100644
--- a/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTestIT.java
+++ b/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTestIT.java
@@ -56,8 +56,8 @@ public class MapPaintPreferenceTestIT {
ImageProvider.clearCache();
Collection<ExtendedSourceEntry> sources = new MapPaintPreference.MapPaintSourceEditor()
.loadAndGetAvailableSources();
- // Drop everything from yopaseopor, too many errors
- sources.removeIf(x -> x.url.contains("yopaseopor/"));
+ // Drop everything from yopaseopor and www.freietonne.de, too many errors
+ sources.removeIf(x -> x.url.contains("yopaseopor/") || x.url.contains("www.freietonne.de"));
assertFalse(sources.isEmpty());
Map<String, Collection<Throwable>> allErrors = new HashMap<>();
Map<String, Collection<String>> allWarnings = new HashMap<>();
@@ -93,8 +93,7 @@ public class MapPaintPreferenceTestIT {
if (!warnings.isEmpty()) {
allWarnings.put(source.url, warnings);
}
- } else if (!source.url.contains("www.freietonne.de")) {
- // ignore frequent network errors with www.freietonne.de causing too much Jenkins failures
+ } else {
allWarnings.put(source.url, Collections.singleton("MapPaintStyles.addStyle() returned null"));
}
}
diff --git a/test/unit/org/openstreetmap/josm/io/remotecontrol/DNSNameFixTest.java b/test/unit/org/openstreetmap/josm/io/remotecontrol/DNSNameFixTest.java
deleted file mode 100644
index 4b7aaff..0000000
--- a/test/unit/org/openstreetmap/josm/io/remotecontrol/DNSNameFixTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io.remotecontrol;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.junit.Test;
-
-/**
- * Unit tests of {@link DNSNameFix} class.
- */
-public class DNSNameFixTest {
-
- /**
- * Unit test of {@link DNSNameFix#DNSNameFix} - null check.
- * @throws IOException always (expected with null name)
- */
- @Test(expected = IOException.class)
- public void testDNSNameNull() throws IOException {
- new DNSNameFix(null);
- }
-
- /**
- * Unit test of {@link DNSNameFix#DNSNameFix} - nominal cases.
- * @throws IOException never
- */
- @Test
- public void testDNSNameNominal() throws IOException {
- assertEquals("localhost", new DNSNameFix("localhost").getName());
- assertEquals("127.0.0.1", new DNSNameFix("127.0.0.1").getName());
- }
-}
diff --git a/tools/pmd/josm-ruleset.xml b/tools/pmd/josm-ruleset.xml
index 26ab3cf..f436930 100644
--- a/tools/pmd/josm-ruleset.xml
+++ b/tools/pmd/josm-ruleset.xml
@@ -15,8 +15,54 @@
<rule ref="rulesets/java/empty.xml"/>
<rule ref="rulesets/java/finalizers.xml"/>
<rule ref="rulesets/java/imports.xml"/>
- <rule ref="rulesets/java/migrating.xml"/>
- <rule ref="rulesets/java/naming.xml"/>-->
+ <rule ref="rulesets/java/migrating.xml"/>-->
+ <rule ref="rulesets/java/naming.xml">
+ <exclude name="AbstractNaming"/>
+ <exclude name="AvoidFieldNameMatchingMethodName"/>
+ <exclude name="AvoidFieldNameMatchingTypeName"/>
+ <exclude name="BooleanGetMethodName"/>
+ <exclude name="LongVariable"/>
+ <exclude name="ShortClassName"/>
+ <exclude name="ShortMethodName"/>
+ <exclude name="ShortVariable"/>
+ <exclude name="MethodNamingConventions"/>
+ <exclude name="VariableNamingConventions"/>
+ </rule>
+ <rule ref="rulesets/java/naming.xml/ShortMethodName">
+ <properties>
+ <property name="violationSuppressXPath" value="//MethodDeclarator[@Image='at' or @Image='ht' or @Image='of' or @Image='ok' or @Image='tr']
+ | //MethodDeclarator/../../Annotation/MarkerAnnotation/Name[@Image='Deprecated']
+ | //MethodDeclarator/../../../..[@Image='LambertConformalConic']"/>
+ </properties>
+ </rule>
+ <rule ref="rulesets/java/naming.xml/MethodNamingConventions">
+ <properties>
+ <property name="violationSuppressXPath" value="//MethodDeclarator/../../../..[@Image='Functions' or @Image='PseudoClasses' or @Image='Role' or @Image='TaggingPreset']"/>
+ </properties>
+ </rule>
+ <rule ref="rulesets/java/naming.xml/VariableNamingConventions">
+ <properties>
+ <property name="violationSuppressXPath" value="//FieldDeclaration[@Public='true']
+ | //FieldDeclaration/../Annotation/MarkerAnnotation/Name[@Image='pref']
+ | //FieldDeclaration/Type/ReferenceType/ClassOrInterfaceType[@Image!='Boolean' and
+ @Image!='Byte' and
+ @Image!='Character' and
+ @Image!='Class' and
+ @Image!='Double' and
+ @Image!='Enum' and
+ @Image!='Float' and
+ @Image!='Integer' and
+ @Image!='Long' and
+ @Image!='Number' and
+ @Image!='Short' and
+ @Image!='String' ]"/>
+ </properties>
+ </rule>
+ <rule ref="rulesets/java/naming.xml/LongVariable">
+ <properties>
+ <property name="minimum" value="44"/>
+ </properties>
+ </rule>
<rule ref="rulesets/java/optimizations.xml">
<exclude name="LocalVariableCouldBeFinal"/>
<exclude name="MethodArgumentCouldBeFinal"/>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git
More information about the Pkg-grass-devel
mailing list